Merge pull request #2311 from tomchristie/allow-empty-text-or-boolean-html-input-if-not-required

Fixes for behavior with empty HTML fields.

1 files changed, 34 insertions, 12 deletions

diff --git a/tests/test_fields.py b/tests/test_fields.py
index 7f7af5cc..04c721d3 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -215,25 +215,47 @@ class TestBooleanHTMLInput:
         assert serializer.validated_data == {'archived': False}
 
 
+class MockHTMLDict(dict):
+    """
+    This class mocks up a dictionary like object, that behaves
+    as if it was returned for multipart or urlencoded data.
+    """
+    getlist = None
+
+
 class TestCharHTMLInput:
-    def setup(self):
+    def test_empty_html_checkbox(self):
         class TestSerializer(serializers.Serializer):
             message = serializers.CharField(default='happy')
-        self.Serializer = TestSerializer
 
-    def test_empty_html_checkbox(self):
-        """
-        HTML checkboxes do not send any value, but should be treated
-        as `False` by BooleanField.
-        """
-        # This class mocks up a dictionary like object, that behaves
-        # as if it was returned for multipart or urlencoded data.
-        class MockHTMLDict(dict):
-            getlist = None
-        serializer = self.Serializer(data=MockHTMLDict())
+        serializer = TestSerializer(data=MockHTMLDict())
         assert serializer.is_valid()
         assert serializer.validated_data == {'message': 'happy'}
 
+    def test_empty_html_checkbox_allow_null(self):
+        class TestSerializer(serializers.Serializer):
+            message = serializers.CharField(allow_null=True)
+
+        serializer = TestSerializer(data=MockHTMLDict())
+        assert serializer.is_valid()
+        assert serializer.validated_data == {'message': None}
+
+    def test_empty_html_checkbox_allow_null_allow_blank(self):
+        class TestSerializer(serializers.Serializer):
+            message = serializers.CharField(allow_null=True, allow_blank=True)
+
+        serializer = TestSerializer(data=MockHTMLDict({}))
+        assert serializer.is_valid()
+        assert serializer.validated_data == {'message': ''}
+
+    def test_empty_html_required_false(self):
+        class TestSerializer(serializers.Serializer):
+            message = serializers.CharField(required=False)
+
+        serializer = TestSerializer(data=MockHTMLDict())
+        assert serializer.is_valid()
+        assert serializer.validated_data == {}
+
 
 class TestCreateOnlyDefault:
     def setup(self):