aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests/serializer.py
diff options
context:
space:
mode:
authorTom Christie2012-01-11 14:56:12 +0000
committerTom Christie2012-01-11 14:56:12 +0000
commitc995ab397c19b956ca91850279798737d4f6b039 (patch)
treecf35dcf77eebd22b8587747600955dd0acae0a2e /djangorestframework/tests/serializer.py
parente8ddbf435cc6ed66e2a5595d2d6a0696377b825a (diff)
downloaddjango-rest-framework-c995ab397c19b956ca91850279798737d4f6b039.tar.bz2
Made suggested cleanups. Refs #121.
Diffstat (limited to 'djangorestframework/tests/serializer.py')
-rw-r--r--djangorestframework/tests/serializer.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/djangorestframework/tests/serializer.py b/djangorestframework/tests/serializer.py
index 7cf9325b..bff8f41e 100644
--- a/djangorestframework/tests/serializer.py
+++ b/djangorestframework/tests/serializer.py
@@ -120,13 +120,17 @@ class TestFieldNesting(TestCase):
self.assertEqual(SerializerM2().serialize(self.m2), {'field': {'field1': u'foo'}})
self.assertEqual(SerializerM3().serialize(self.m3), {'field': {'field2': u'bar'}})
- def test_serializer_unvalid_hook_method(self):
+ def test_serializer_overridden_hook_method(self):
"""
- Test serializing a model instance with an unvalid hook method on the serializer.
+ Test serializing a model instance which overrides a class method on the
+ serializer. Checks for correct behaviour in odd edge case.
"""
class SerializerM2(Serializer):
- fields = ('unvalid_hook', )
- def unvalid_hook(self):
- return
- self.m2.unvalid_hook = 'bla'
- self.assertEqual(SerializerM2().serialize_model(self.m2), {'unvalid_hook': 'bla'})
+ fields = ('overridden', )
+
+ def overridden(self):
+ return False
+
+ self.m2.overridden = True
+ self.assertEqual(SerializerM2().serialize_model(self.m2),
+ {'overridden': True})