aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/tests
diff options
context:
space:
mode:
authorTom Christie2012-01-11 06:53:32 -0800
committerTom Christie2012-01-11 06:53:32 -0800
commite8ddbf435cc6ed66e2a5595d2d6a0696377b825a (patch)
treea32df3af3e48fb9612844ab6ab36bb90a61a9408 /djangorestframework/tests
parent840845e9eff35299ffc524f8aea806c9a8a4b54c (diff)
parent792bc4d60814af026f926a4c92a9d4a8e3124341 (diff)
downloaddjango-rest-framework-e8ddbf435cc6ed66e2a5595d2d6a0696377b825a.tar.bz2
Merge pull request #121 from sebpiq/issue-73
Fixes #73. Thanks @sebpiq, @ekohl!
Diffstat (limited to 'djangorestframework/tests')
-rw-r--r--djangorestframework/tests/serializer.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/djangorestframework/tests/serializer.py b/djangorestframework/tests/serializer.py
index 8e370fa1..7cf9325b 100644
--- a/djangorestframework/tests/serializer.py
+++ b/djangorestframework/tests/serializer.py
@@ -34,9 +34,7 @@ class TestObjectToData(TestCase):
self.assertEquals(self.serialize(Foo().foo), 1)
def test_datetime(self):
- """
- datetime objects are left as-is.
- """
+ """datetime objects are left as-is."""
now = datetime.datetime.now()
self.assertEquals(self.serialize(now), now)
@@ -121,3 +119,14 @@ 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):
+ """
+ Test serializing a model instance with an unvalid hook method on the serializer.
+ """
+ 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'})