Merge pull request #1348 from yprez/none-to-empty-string_2.4

Coerce None to empty string

1 files changed, 22 insertions, 0 deletions

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 86f365de..6d9b85ee 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -1124,6 +1124,20 @@ class BlankFieldTests(TestCase):
         serializer = self.model_serializer_class(data={})
         self.assertEqual(serializer.is_valid(), True)
 
+    def test_create_model_null_field_save(self):
+        """
+        Regression test for #1330.
+
+        https://github.com/tomchristie/django-rest-framework/pull/1330
+        """
+        serializer = self.model_serializer_class(data={'title': None})
+        self.assertEqual(serializer.is_valid(), True)
+
+        try:
+            serializer.save()
+        except Exception:
+            self.fail('Exception raised on save() after validation passes')
+
 
 #test for issue #460
 class SerializerPickleTests(TestCase):
@@ -1490,6 +1504,7 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
             image_field = models.ImageField(max_length=1024, blank=True)
             slug_field = models.SlugField(max_length=1024, blank=True)
             url_field = models.URLField(max_length=1024, blank=True)
+            nullable_char_field = models.CharField(max_length=1024, blank=True, null=True)
 
         class AMOAFSerializer(serializers.ModelSerializer):
             class Meta:
@@ -1522,6 +1537,10 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
             'url_field': [
                 ('max_length', 1024),
             ],
+            'nullable_char_field': [
+                ('max_length', 1024),
+                ('allow_none', True),
+            ],
         }
 
     def field_test(self, field):
@@ -1558,6 +1577,9 @@ class AttributeMappingOnAutogeneratedFieldsTests(TestCase):
     def test_url_field(self):
         self.field_test('url_field')
 
+    def test_nullable_char_field(self):
+        self.field_test('nullable_char_field')
+
 
 class DefaultValuesOnAutogeneratedFieldsTests(TestCase):