aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/serializer_nested.py
diff options
context:
space:
mode:
authorTom Christie2013-05-09 00:57:27 -0700
committerTom Christie2013-05-09 00:57:27 -0700
commit9428d6ddb5ebc2d5d9c8557a52be09f0def69cca (patch)
tree41003692e65e08934fed7c0cee263e34da1a4110 /rest_framework/tests/serializer_nested.py
parent0080bf8a00bcfb1988a5e73fae5635bf4969d534 (diff)
parent14482a966168a98d43099d00c163d1c8c3b6471b (diff)
downloaddjango-rest-framework-9428d6ddb5ebc2d5d9c8557a52be09f0def69cca.tar.bz2
Merge pull request #817 from maspwr/writable-nested-modelserializer
Merge master into writable-nested-modelserializer
Diffstat (limited to 'rest_framework/tests/serializer_nested.py')
-rw-r--r--rest_framework/tests/serializer_nested.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/tests/serializer_nested.py b/rest_framework/tests/serializer_nested.py
index 6a29c652..71d0e24b 100644
--- a/rest_framework/tests/serializer_nested.py
+++ b/rest_framework/tests/serializer_nested.py
@@ -109,7 +109,7 @@ class WritableNestedSerializerBasicTests(TestCase):
}
]
- serializer = self.AlbumSerializer(data=data)
+ serializer = self.AlbumSerializer(data=data, many=True)
self.assertEqual(serializer.is_valid(), False)
self.assertEqual(serializer.errors, expected_errors)
@@ -241,6 +241,6 @@ class WritableNestedSerializerObjectTests(TestCase):
)
]
- serializer = self.AlbumSerializer(data=data)
+ serializer = self.AlbumSerializer(data=data, many=True)
self.assertEqual(serializer.is_valid(), True)
self.assertEqual(serializer.object, expected_object)