NullBooleanField

2 files changed, 29 insertions, 2 deletions

diff --git a/tests/test_fields.py b/tests/test_fields.py
index 6bf9aed4..91f3f5db 100644
--- a/tests/test_fields.py
+++ b/tests/test_fields.py
@@ -124,7 +124,8 @@ class TestBooleanField(FieldValues):
         False: False,
     }
     invalid_inputs = {
-        'foo': ['`foo` is not a valid boolean.']
+        'foo': ['`foo` is not a valid boolean.'],
+        None: ['This field may not be null.']
     }
     outputs = {
         'true': True,
@@ -140,6 +141,32 @@ class TestBooleanField(FieldValues):
     field = fields.BooleanField()
 
 
+class TestNullBooleanField(FieldValues):
+    """
+    Valid and invalid values for `BooleanField`.
+    """
+    valid_inputs = {
+        'true': True,
+        'false': False,
+        'null': None,
+        True: True,
+        False: False,
+        None: None
+    }
+    invalid_inputs = {
+        'foo': ['`foo` is not a valid boolean.'],
+    }
+    outputs = {
+        'true': True,
+        'false': False,
+        'null': None,
+        True: True,
+        False: False,
+        None: None
+    }
+    field = fields.NullBooleanField()
+
+
 # String types...
 
 class TestCharField(FieldValues):
diff --git a/tests/test_model_serializer.py b/tests/test_model_serializer.py
index 731ed2fb..f7475024 100644
--- a/tests/test_model_serializer.py
+++ b/tests/test_model_serializer.py
@@ -90,7 +90,7 @@ class TestRegularFieldMappings(TestCase):
                 email_field = EmailField(max_length=100)
                 float_field = FloatField()
                 integer_field = IntegerField()
-                null_boolean_field = BooleanField(allow_null=True)
+                null_boolean_field = NullBooleanField()
                 positive_integer_field = IntegerField()
                 positive_small_integer_field = IntegerField()
                 slug_field = SlugField(max_length=100)