From 9e291879d1705dea18131fc66be31e422afa1e62 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 6 Mar 2014 15:24:07 +0100
Subject: Added an optional unique field to Album and checked that duplicates
 are detected.

---
 rest_framework/tests/test_serializer.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'rest_framework/tests/test_serializer.py')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 198c269f..17ef191a 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -611,12 +611,15 @@ class ModelValidationTests(TestCase):
         """
         Just check if serializers.ModelSerializer handles unique checks via .full_clean()
         """
-        serializer = AlbumsSerializer(data={'title': 'a'})
+        serializer = AlbumsSerializer(data={'title': 'a', 'ref': '1'})
         serializer.is_valid()
         serializer.save()
         second_serializer = AlbumsSerializer(data={'title': 'a'})
         self.assertFalse(second_serializer.is_valid())
-        self.assertEqual(second_serializer.errors,  {'title': ['Album with this Title already exists.']})
+        self.assertEqual(second_serializer.errors,  {'title': ['Album with this Title already exists.'],})
+        third_serializer = AlbumsSerializer(data={'title': 'b', 'ref': '1'})
+        self.assertFalse(third_serializer.is_valid())
+        self.assertEqual(third_serializer.errors,  {'ref': ['Album with this Ref already exists.'],})
 
     def test_foreign_key_is_null_with_partial(self):
         """
-- 
cgit v1.2.3


From de899824b8352912d2a0d2fa030b8e5a053a3ae5 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 6 Mar 2014 16:43:30 +0100
Subject: Forgot to add the ref field to the field list.

---
 rest_framework/tests/test_serializer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/tests/test_serializer.py')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 17ef191a..56714d1e 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -161,7 +161,7 @@ class AlbumsSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Album
-        fields = ['title']  # lists are also valid options
+        fields = ['title', 'ref']  # lists are also valid options
 
 
 class PositiveIntegerAsChoiceSerializer(serializers.ModelSerializer):
-- 
cgit v1.2.3


From caf4d36cb3484313a36453a229bfc002a075f811 Mon Sep 17 00:00:00 2001
From: Xavier Ordoquy
Date: Thu, 6 Mar 2014 21:17:41 +0100
Subject: More complex test case.

---
 rest_framework/tests/test_serializer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework/tests/test_serializer.py')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 56714d1e..44163011 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -617,9 +617,9 @@ class ModelValidationTests(TestCase):
         second_serializer = AlbumsSerializer(data={'title': 'a'})
         self.assertFalse(second_serializer.is_valid())
         self.assertEqual(second_serializer.errors,  {'title': ['Album with this Title already exists.'],})
-        third_serializer = AlbumsSerializer(data={'title': 'b', 'ref': '1'})
+        third_serializer = AlbumsSerializer(data=[{'title': 'b', 'ref': '1'}, {'title': 'c'}])
         self.assertFalse(third_serializer.is_valid())
-        self.assertEqual(third_serializer.errors,  {'ref': ['Album with this Ref already exists.'],})
+        self.assertEqual(third_serializer.errors,  [{'ref': ['Album with this Ref already exists.']}, {}])
 
     def test_foreign_key_is_null_with_partial(self):
         """
-- 
cgit v1.2.3