aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests
diff options
context:
space:
mode:
authorTom Christie2013-03-22 17:01:06 +0000
committerTom Christie2013-03-22 17:01:06 +0000
commit13794baf7016f7d44daffb55d29e3dbc56f7612d (patch)
treec330b1ab6eb5d7a66011e995ee8a75405eade0d5 /rest_framework/tests
parentb4210f9a56fb7f8913f674aecb304da01e2e9f64 (diff)
downloaddjango-rest-framework-13794baf7016f7d44daffb55d29e3dbc56f7612d.tar.bz2
Bit of extra tidying and plenty of docs
Diffstat (limited to 'rest_framework/tests')
-rw-r--r--rest_framework/tests/serializer_bulk_update.py26
1 files changed, 24 insertions, 2 deletions
diff --git a/rest_framework/tests/serializer_bulk_update.py b/rest_framework/tests/serializer_bulk_update.py
index 2f416488..afc1a1a9 100644
--- a/rest_framework/tests/serializer_bulk_update.py
+++ b/rest_framework/tests/serializer_bulk_update.py
@@ -201,7 +201,29 @@ class BulkUpdateSerializerTests(TestCase):
'author': 'Haruki Murakami'
}
]
- serializer = self.BookSerializer(self.books(), data=data, many=True)
+ serializer = self.BookSerializer(self.books(), data=data, many=True, allow_delete=True)
+ self.assertEqual(serializer.is_valid(), True)
+ self.assertEqual(serializer.data, data)
+ serializer.save()
+ new_data = self.BookSerializer(self.books(), many=True).data
+ self.assertEqual(data, new_data)
+
+ def test_bulk_update_and_create(self):
+ """
+ Bulk update serialization may also include created items.
+ """
+ data = [
+ {
+ 'id': 0,
+ 'title': 'The electric kool-aid acid test',
+ 'author': 'Tom Wolfe'
+ }, {
+ 'id': 3,
+ 'title': 'Kafka on the shore',
+ 'author': 'Haruki Murakami'
+ }
+ ]
+ serializer = self.BookSerializer(self.books(), data=data, many=True, allow_delete=True)
self.assertEqual(serializer.is_valid(), True)
self.assertEqual(serializer.data, data)
serializer.save()
@@ -227,6 +249,6 @@ class BulkUpdateSerializerTests(TestCase):
{},
{'id': ['Enter a whole number.']}
]
- serializer = self.BookSerializer(self.books(), data=data, many=True)
+ serializer = self.BookSerializer(self.books(), data=data, many=True, allow_delete=True)
self.assertEqual(serializer.is_valid(), False)
self.assertEqual(serializer.errors, expected_errors)