From 19c03f4a60f339397b8ed03c9e6f20b3c604ffc3 Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Thu, 20 Mar 2014 01:49:30 +0400
Subject: Added test writable star source Uses nested serializer with parent
 object

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

(limited to 'rest_framework/tests')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index 85a899c5..b78ceaa6 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -508,6 +508,32 @@ class ValidationTests(TestCase):
         )
         self.assertEqual(serializer.is_valid(), True)
 
+    def test_writable_star_source_on_nested_serializer_with_parent_object(self):
+        class Serializer(serializers.Serializer):
+            title = serializers.WritableField(source='title')
+
+        class AlbumSerializer(serializers.ModelSerializer):
+            nested = Serializer(source='*')
+
+            class Meta:
+                model = Album
+                fields = ('nested',)
+
+        class PhotoSerializer(serializers.ModelSerializer):
+            album = AlbumSerializer(source='album')
+
+            class Meta:
+                model = Photo
+                fields = ('album', )
+
+        photo = Photo(album=Album())
+
+        data = {'album': {'nested': {'title': 'test'}}}
+
+        serializer = PhotoSerializer(photo, data=data)
+        self.assertEqual(serializer.is_valid(), True)
+        self.assertEqual(serializer.data, data)
+
     def test_writable_star_source_with_inner_source_fields(self):
         """
         Tests that a serializer with source="*" correctly expands the
-- 
cgit v1.2.3


From f5fc6937ece8c2bc70088979cc19c2c0a660c7a0 Mon Sep 17 00:00:00 2001
From: Vladislav Vlastovskiy
Date: Thu, 20 Mar 2014 20:27:07 +0400
Subject: Change serializer name for removing confusion

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

(limited to 'rest_framework/tests')

diff --git a/rest_framework/tests/test_serializer.py b/rest_framework/tests/test_serializer.py
index b78ceaa6..3ee2b38a 100644
--- a/rest_framework/tests/test_serializer.py
+++ b/rest_framework/tests/test_serializer.py
@@ -509,11 +509,11 @@ class ValidationTests(TestCase):
         self.assertEqual(serializer.is_valid(), True)
 
     def test_writable_star_source_on_nested_serializer_with_parent_object(self):
-        class Serializer(serializers.Serializer):
+        class TitleSerializer(serializers.Serializer):
             title = serializers.WritableField(source='title')
 
         class AlbumSerializer(serializers.ModelSerializer):
-            nested = Serializer(source='*')
+            nested = TitleSerializer(source='*')
 
             class Meta:
                 model = Album
-- 
cgit v1.2.3