summaryrefslogtreecommitdiff
path: root/tests/serializers
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2017-05-06 10:56:28 -0400
committerTim Graham <timograham@gmail.com>2018-03-20 12:10:10 -0400
commit5fa4f40f45fcdbb7e48489ed3039a314b5c961d0 (patch)
tree272b8798d2c2a054f56d8613a42453bce30f92c0 /tests/serializers
parent73f7d1755ff1da3aac687c7b046e4b5028e505db (diff)
downloaddjango-5fa4f40f45fcdbb7e48489ed3039a314b5c961d0.tar.gz
Fixed #29227 -- Allowed BooleanField to be null=True.
Thanks Lynn Cyrin for contributing to the patch, and Nick Pope for review.
Diffstat (limited to 'tests/serializers')
-rw-r--r--tests/serializers/models/data.py6
-rw-r--r--tests/serializers/test_data.py3
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/serializers/models/data.py b/tests/serializers/models/data.py
index b62f85a868..533ccf6830 100644
--- a/tests/serializers/models/data.py
+++ b/tests/serializers/models/data.py
@@ -18,7 +18,7 @@ class BinaryData(models.Model):
class BooleanData(models.Model):
- data = models.BooleanField(default=False)
+ data = models.BooleanField(default=False, null=True)
class CharData(models.Model):
@@ -226,10 +226,6 @@ class IntegerPKData(models.Model):
class GenericIPAddressPKData(models.Model):
data = models.GenericIPAddressField(primary_key=True)
-# This is just a Boolean field with null=True, and we can't test a PK value of NULL.
-# class NullBooleanPKData(models.Model):
-# data = models.NullBooleanField(primary_key=True)
-
class PositiveIntegerPKData(models.Model):
data = models.PositiveIntegerField(primary_key=True)
diff --git a/tests/serializers/test_data.py b/tests/serializers/test_data.py
index 467292bff1..9f0e311d62 100644
--- a/tests/serializers/test_data.py
+++ b/tests/serializers/test_data.py
@@ -200,6 +200,7 @@ test_data = [
(data_obj, 2, BinaryData, None),
(data_obj, 5, BooleanData, True),
(data_obj, 6, BooleanData, False),
+ (data_obj, 7, BooleanData, None),
(data_obj, 10, CharData, "Test Char Data"),
(data_obj, 11, CharData, ""),
(data_obj, 12, CharData, "None"),
@@ -334,8 +335,6 @@ The end."""),
(pk_obj, 682, IntegerPKData, 0),
# (XX, ImagePKData
(pk_obj, 695, GenericIPAddressPKData, "fe80:1424:2223:6cff:fe8a:2e8a:2151:abcd"),
- # (pk_obj, 700, NullBooleanPKData, True),
- # (pk_obj, 701, NullBooleanPKData, False),
(pk_obj, 720, PositiveIntegerPKData, 123456789),
(pk_obj, 730, PositiveSmallIntegerPKData, 12),
(pk_obj, 740, SlugPKData, "this-is-a-slug"),