aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2013-02-04 21:19:11 +0000
committerTom Christie2013-02-04 21:19:11 +0000
commit937ef008081fb20907494eb888e7374a8eb51a4f (patch)
tree28fd51ae256ab92f4142806cca8493980b5504f7 /rest_framework
parent0a38bc9db8c7ad5c1a9c8429ac799260c7257a39 (diff)
parent221e77d3575c182eb49d50546f844f392a5f7ba6 (diff)
downloaddjango-rest-framework-937ef008081fb20907494eb888e7374a8eb51a4f.tar.bz2
Merge branch 'master' into 2.2
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/tests/serializer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index dda388aa..a0e1474f 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -845,7 +845,7 @@ class BlankFieldTests(TestCase):
serializer = self.not_blank_model_serializer_class(data=self.data)
self.assertEquals(serializer.is_valid(), False)
- def test_create_model_null_field(self):
+ def test_create_model_empty_field(self):
serializer = self.model_serializer_class(data={})
self.assertEquals(serializer.is_valid(), True)