Merge branch 'master' into 2.2

This commit is contained in:
Tom Christie 2013-02-04 21:19:11 +00:00
commit 937ef00808

View File

@ -845,7 +845,7 @@ class BlankFieldTests(TestCase):
serializer = self.not_blank_model_serializer_class(data=self.data) serializer = self.not_blank_model_serializer_class(data=self.data)
self.assertEquals(serializer.is_valid(), False) 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={}) serializer = self.model_serializer_class(data={})
self.assertEquals(serializer.is_valid(), True) self.assertEquals(serializer.is_valid(), True)