From ca5b99486d15e7392754178ab0948de2a60763a3 Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Thu, 22 Nov 2012 22:36:37 +0100
Subject: Added _post_clean() behaviour by adding a .perform_model_validation()
 method. Fixed some tests that were failing due to extra strict validation.

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

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 61a05da1..5751e894 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -169,7 +169,7 @@ class ValidationTests(TestCase):
             'content': 'x' * 1001,
             'created': datetime.datetime(2012, 1, 1)
         }
-        self.actionitem = ActionItem('Some to do item',
+        self.actionitem = ActionItem(title='Some to do item',
         )
 
     def test_create(self):
-- 
cgit v1.2.3


From 3f47f6cea9d178a57855e3b90208601b7e28a80f Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Thu, 22 Nov 2012 23:50:42 +0100
Subject: Added a validate_unique test.

---
 rest_framework/tests/serializer.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 5751e894..0baf0e89 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,7 +1,7 @@
 import datetime
 from django.test import TestCase
 from rest_framework import serializers
-from rest_framework.tests.models import (ActionItem, Anchor, BasicModel,
+from rest_framework.tests.models import (Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel,
     ManyToManyModel, Person, ReadOnlyManyToManyModel)
 
@@ -48,7 +48,7 @@ class BookSerializer(serializers.ModelSerializer):
 
 
 class ActionItemSerializer(serializers.ModelSerializer):
-    
+
     class Meta:
         model = ActionItem
 
@@ -62,6 +62,12 @@ class PersonSerializer(serializers.ModelSerializer):
         read_only_fields = ('age',)
 
 
+class AlbumsSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = Album
+
+
 class BasicTests(TestCase):
     def setUp(self):
         self.comment = Comment(
@@ -276,6 +282,16 @@ class ValidationTests(TestCase):
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'info': [u'Ensure this value has at most 12 characters (it has 13).']})
 
+    def test_validate_unique(self):
+        """
+        Just check if serializers.ModelSerializer.perform_model_validation() handles unique checks via .full_clean()
+        """
+        serializer = AlbumsSerializer(data={'title': 'a'})
+        serializer.is_valid()
+        serializer.save()
+        second_serializer = AlbumsSerializer(data={'title': 'a'})
+        self.assertFalse(second_serializer.is_valid())
+
 
 class RegexValidationTest(TestCase):
     def test_create_failed(self):
-- 
cgit v1.2.3


From e7666014a85d65e204b40e1f54911e654f974932 Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Mon, 26 Nov 2012 23:39:49 +0100
Subject: Added an assertion to the tests that checks the '.errors' value for
 the unique-test

---
 rest_framework/tests/serializer.py | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 0baf0e89..bdf72a91 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -291,6 +291,7 @@ class ValidationTests(TestCase):
         serializer.save()
         second_serializer = AlbumsSerializer(data={'title': 'a'})
         self.assertFalse(second_serializer.is_valid())
+        self.assertEqual(second_serializer.errors,  {'title': [u'Album with this Title already exists.']})
 
 
 class RegexValidationTest(TestCase):
-- 
cgit v1.2.3


From e311b763e193b41c6a679ddbcf813702691145a0 Mon Sep 17 00:00:00 2001
From: Pavel Savchenko
Date: Fri, 30 Nov 2012 01:34:46 +0200
Subject: add traverse_related feature + tests (fixes issue#461)

---
 rest_framework/tests/serializer.py | 41 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 61a05da1..b16f2772 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -560,6 +560,47 @@ class ManyRelatedTests(TestCase):
         self.assertEqual(serializer.data, expected)
 
 
+class RelatedTraversalTest(TestCase):
+    def test_nested_traversal(self):
+        user = Person.objects.create(name="django")
+        post = BlogPost.objects.create(title="Test blog post", writer=user)
+        post.blogpostcomment_set.create(text="I love this blog post")
+
+        from rest_framework.tests.models import BlogPostComment
+
+        class PersonSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Person
+                fields = ("name", "age")
+
+        class BlogPostCommentSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = BlogPostComment
+                fields = ("text", "post_owner")
+
+            text = serializers.CharField()
+            post_owner = PersonSerializer(source='blog_post.writer')
+
+        class BlogPostSerializer(serializers.Serializer):
+            title = serializers.CharField()
+            comments = BlogPostCommentSerializer(source='blogpostcomment_set')
+
+        serializer = BlogPostSerializer(instance=post)
+
+        expected = {
+            'title': 'Test blog post',
+            'comments': [{
+                'text': 'I hate this blog post',
+                'post_owner': {
+                    "name": "django",
+                    "age": None
+                }
+            }]
+        }
+
+        self.assertEqual(serializer.data, expected)
+
+
 class SerializerMethodFieldTests(TestCase):
     def setUp(self):
 
-- 
cgit v1.2.3


From 1c1bd3fc5d7e65ae8c16e9946be87956c96a1723 Mon Sep 17 00:00:00 2001
From: Pavel Savchenko
Date: Fri, 30 Nov 2012 01:37:21 +0200
Subject: fix test response

---
 rest_framework/tests/serializer.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index b16f2772..26a7d6bf 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -588,11 +588,11 @@ class RelatedTraversalTest(TestCase):
         serializer = BlogPostSerializer(instance=post)
 
         expected = {
-            'title': 'Test blog post',
+            'title': u'Test blog post',
             'comments': [{
-                'text': 'I hate this blog post',
+                'text': u'I love this blog post',
                 'post_owner': {
-                    "name": "django",
+                    "name": u"django",
                     "age": None
                 }
             }]
-- 
cgit v1.2.3


From 705c7ad09db65c6ea6fb69bbd417cb7a45f6e3b9 Mon Sep 17 00:00:00 2001
From: Ben Roberts
Date: Wed, 5 Dec 2012 17:43:47 -0700
Subject: added tests and fix for unpickleable metadata in
 SortedDictWithMetadata

---
 rest_framework/tests/serializer.py | 47 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 61a05da1..af182917 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,9 +1,9 @@
-import datetime
+import datetime, pickle
 from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel, BlogPostComment)
 
 
 class SubComment(object):
@@ -641,3 +641,46 @@ class BlankFieldTests(TestCase):
         """
         serializer = self.not_blank_model_serializer_class(data=self.data)
         self.assertEquals(serializer.is_valid(), False)
+
+
+#class PersonGroup(object):
+#    name = "group"
+#    persons = [Person(name="joe"), Person(name="job")]
+#
+#class PersonGroupSerializer(serializers.Serializer):
+#    name = serializers.CharField()
+#    persons = PersonSerializer()
+#
+#class BlogPostSerializer(serializers.ModelSerializer):
+#    class Meta:
+#        model = BlogPost
+#
+#
+#class BlogPostCommentSerializer(serializers.ModelSerializer):
+#    class Meta:
+#        model = BlogPostComment
+#        fields = ('text', 'blog_post')
+#
+#    blog_post = BlogPostSerializer()
+#
+
+#test for issue #460
+class SerializerPickleTests(TestCase):
+    """ Test pickleability of the output of Serializers
+    """
+    def test_pickle_simple_model_serializer_data(self):
+        """ Test simple serializer
+        """
+        pickle.dumps(PersonSerializer(Person(name="Methusela", age=969)).data)
+
+
+    def test_pickle_inner_serializer(self):
+        """ Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will
+         have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle.
+         See DictWithMetadata.__getstate__
+        """
+        class InnerPersonSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Person
+                fields = ('name', 'age')
+        pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data)
-- 
cgit v1.2.3


From 7f28a784146b9ba6ab303e79597f85a0f8b1e76e Mon Sep 17 00:00:00 2001
From: Ben Roberts
Date: Wed, 5 Dec 2012 17:54:21 -0700
Subject: cleaned up last commit

---
 rest_framework/tests/serializer.py | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index af182917..9cedb54b 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -3,7 +3,7 @@ from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel, BlogPostComment)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel)
 
 
 class SubComment(object):
@@ -643,27 +643,6 @@ class BlankFieldTests(TestCase):
         self.assertEquals(serializer.is_valid(), False)
 
 
-#class PersonGroup(object):
-#    name = "group"
-#    persons = [Person(name="joe"), Person(name="job")]
-#
-#class PersonGroupSerializer(serializers.Serializer):
-#    name = serializers.CharField()
-#    persons = PersonSerializer()
-#
-#class BlogPostSerializer(serializers.ModelSerializer):
-#    class Meta:
-#        model = BlogPost
-#
-#
-#class BlogPostCommentSerializer(serializers.ModelSerializer):
-#    class Meta:
-#        model = BlogPostComment
-#        fields = ('text', 'blog_post')
-#
-#    blog_post = BlogPostSerializer()
-#
-
 #test for issue #460
 class SerializerPickleTests(TestCase):
     """ Test pickleability of the output of Serializers
-- 
cgit v1.2.3


From cb7d9ea5c9843ffa99db4400670a11c3651520cc Mon Sep 17 00:00:00 2001
From: Ben Roberts
Date: Thu, 6 Dec 2012 12:45:50 -0700
Subject: cleaned up white space & docstring styling

---
 rest_framework/tests/serializer.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 9cedb54b..31dd3699 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -645,18 +645,20 @@ class BlankFieldTests(TestCase):
 
 #test for issue #460
 class SerializerPickleTests(TestCase):
-    """ Test pickleability of the output of Serializers
+    """
+    Test pickleability of the output of Serializers
     """
     def test_pickle_simple_model_serializer_data(self):
-        """ Test simple serializer
+        """
+        Test simple serializer
         """
         pickle.dumps(PersonSerializer(Person(name="Methusela", age=969)).data)
 
-
     def test_pickle_inner_serializer(self):
-        """ Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will
-         have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle.
-         See DictWithMetadata.__getstate__
+        """
+        Test pickling a serializer whose resulting .data (a SortedDictWithMetadata) will
+        have unpickleable meta data--in order to make sure metadata doesn't get pulled into the pickle.
+        See DictWithMetadata.__getstate__
         """
         class InnerPersonSerializer(serializers.ModelSerializer):
             class Meta:
-- 
cgit v1.2.3


From d0935d1fbb87711b0ffda8655c44ede29ee4208a Mon Sep 17 00:00:00 2001
From: Marko Tibold
Date: Mon, 10 Dec 2012 23:10:04 +0100
Subject: get_excluded_fieldnames() should respect Meta options' ability to be
 either a tuple or list. Fixes #490. Refactored `if self.opt.fields` out of
 the for loop. Updated and cleaned up the validation-tests.

---
 rest_framework/tests/serializer.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 455fa270..a16f6abd 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -66,6 +66,7 @@ class AlbumsSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Album
+        fields = ['title']  # lists are also valid options
 
 
 class BasicTests(TestCase):
@@ -282,9 +283,11 @@ class ValidationTests(TestCase):
         self.assertEquals(serializer.is_valid(), False)
         self.assertEquals(serializer.errors, {'info': [u'Ensure this value has at most 12 characters (it has 13).']})
 
+
+class ModelValidationTests(TestCase):
     def test_validate_unique(self):
         """
-        Just check if serializers.ModelSerializer.perform_model_validation() handles unique checks via .full_clean()
+        Just check if serializers.ModelSerializer handles unique checks via .full_clean()
         """
         serializer = AlbumsSerializer(data={'title': 'a'})
         serializer.is_valid()
-- 
cgit v1.2.3


From 80f15c598afe138df4170ceb2198484889511d0c Mon Sep 17 00:00:00 2001
From: George Kappel
Date: Tue, 11 Dec 2012 09:14:52 -0600
Subject: Added depth test

---
 rest_framework/tests/serializer.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index a16f6abd..f80762f0 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -726,3 +726,24 @@ class SerializerPickleTests(TestCase):
                 model = Person
                 fields = ('name', 'age')
         pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data)
+
+class DepthTest(TestCase):
+    def test_depth(self):
+        user = Person.objects.create(name="django",age=1)
+        post = BlogPost.objects.create(title="Test blog post", writer=user)
+
+        class PersonSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Person
+                fields = ("name", "age")
+
+        class BlogPostSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = BlogPost
+                depth = 1
+
+        serializer = BlogPostSerializer(instance=post)
+        expected = {'id': 1, 'title': u'Test blog post',
+                    'writer': {'id': 1, 'name': u'django', 'age':1}}
+
+        self.assertEqual(serializer.data, expected)
-- 
cgit v1.2.3


From 405822330958c5432dde56b07a61b223c03ca4c7 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 11 Dec 2012 21:07:25 +0000
Subject: Fix broken nested fields

---
 rest_framework/tests/serializer.py | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index f80762f0..50a5f5a4 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -1,4 +1,5 @@
-import datetime, pickle
+import datetime
+import pickle
 from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (Album, ActionItem, Anchor, BasicModel,
@@ -727,23 +728,39 @@ class SerializerPickleTests(TestCase):
                 fields = ('name', 'age')
         pickle.dumps(InnerPersonSerializer(Person(name="Noah", age=950)).data)
 
+
 class DepthTest(TestCase):
-    def test_depth(self):
-        user = Person.objects.create(name="django",age=1)
-        post = BlogPost.objects.create(title="Test blog post", writer=user)
+    def test_implicit_nesting(self):
+        writer = Person.objects.create(name="django", age=1)
+        post = BlogPost.objects.create(title="Test blog post", writer=writer)
+
+        class BlogPostSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = BlogPost
+                depth = 1
+
+        serializer = BlogPostSerializer(instance=post)
+        expected = {'id': 1, 'title': u'Test blog post',
+                    'writer': {'id': 1, 'name': u'django', 'age': 1}}
+
+        self.assertEqual(serializer.data, expected)
+
+    def test_explicit_nesting(self):
+        writer = Person.objects.create(name="django", age=1)
+        post = BlogPost.objects.create(title="Test blog post", writer=writer)
 
         class PersonSerializer(serializers.ModelSerializer):
             class Meta:
                 model = Person
-                fields = ("name", "age")
 
         class BlogPostSerializer(serializers.ModelSerializer):
+            writer = PersonSerializer()
+
             class Meta:
                 model = BlogPost
-                depth = 1
 
         serializer = BlogPostSerializer(instance=post)
         expected = {'id': 1, 'title': u'Test blog post',
-                    'writer': {'id': 1, 'name': u'django', 'age':1}}
+                    'writer': {'id': 1, 'name': u'django', 'age': 1}}
 
         self.assertEqual(serializer.data, expected)
-- 
cgit v1.2.3


From 497da7fc699b9e88c966e37bc48739865336683d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 12 Dec 2012 20:44:55 +0000
Subject: Clean up field initialization.  Fixes #497

---
 rest_framework/tests/serializer.py | 54 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

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

diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index 50a5f5a4..780177aa 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -4,7 +4,7 @@ from django.test import TestCase
 from rest_framework import serializers
 from rest_framework.tests.models import (Album, ActionItem, Anchor, BasicModel,
     BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel,
-    ManyToManyModel, Person, ReadOnlyManyToManyModel)
+    ManyToManyModel, Person, ReadOnlyManyToManyModel, Photo)
 
 
 class SubComment(object):
@@ -764,3 +764,55 @@ class DepthTest(TestCase):
                     'writer': {'id': 1, 'name': u'django', 'age': 1}}
 
         self.assertEqual(serializer.data, expected)
+
+
+class NestedSerializerContextTests(TestCase):
+
+    def test_nested_serializer_context(self):
+        """
+        Regression for #497
+
+        https://github.com/tomchristie/django-rest-framework/issues/497
+        """
+        class PhotoSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Photo
+                fields = ("description", "callable")
+
+            callable = serializers.SerializerMethodField('_callable')
+
+            def _callable(self, instance):
+                if not 'context_item' in self.context:
+                    raise RuntimeError("context isn't getting passed into 2nd level nested serializer")
+                return "success"
+
+        class AlbumSerializer(serializers.ModelSerializer):
+            class Meta:
+                model = Album
+                fields = ("photo_set", "callable")
+
+            photo_set = PhotoSerializer(source="photo_set")
+            callable = serializers.SerializerMethodField("_callable")
+
+            def _callable(self, instance):
+                if not 'context_item' in self.context:
+                    raise RuntimeError("context isn't getting passed into 1st level nested serializer")
+                return "success"
+
+        class AlbumCollection(object):
+            albums = None
+
+        class AlbumCollectionSerializer(serializers.Serializer):
+            albums = AlbumSerializer(source="albums")
+
+        album1 = Album.objects.create(title="album 1")
+        album2 = Album.objects.create(title="album 2")
+        Photo.objects.create(description="Bigfoot", album=album1)
+        Photo.objects.create(description="Unicorn", album=album1)
+        Photo.objects.create(description="Yeti", album=album2)
+        Photo.objects.create(description="Sasquatch", album=album2)
+        album_collection = AlbumCollection()
+        album_collection.albums = [album1, album2]
+
+        # This will raise RuntimeError if context doesn't get passed correctly to the nested Serializers
+        AlbumCollectionSerializer(album_collection, context={'context_item': 'album context'}).data
-- 
cgit v1.2.3