Fix serializer instantiation (denisorehovsky#3)

Author: denisorehovsky

rest_polymorphic/serializers.py

@@ -35,9 +35,8 @@ def __init__(self, *args, **kwargs):
 
         for model, serializer in model_serializer_mapping.items():
             resource_type = self.to_resource_type(model)
-            serializer = (serializer(context=self.context)
-                          if callable(serializer)
-                          else serializer)
+            if callable(serializer):
+                serializer = serializer(*args, **kwargs)
 
             self.resource_type_model_mapping[resource_type] = model
             self.model_serializer_mapping[model] = serializer

tests/models.py

@@ -5,6 +5,7 @@
 
 class BlogBase(PolymorphicModel):
     name = models.CharField(max_length=10)
+    slug = models.SlugField(max_length=255, unique=True)
 
 
 class BlogOne(BlogBase):

tests/serializers.py

@@ -9,21 +9,21 @@ class BlogBaseSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = BlogBase
-        fields = ('name', )
+        fields = ('name', 'slug')
 
 
 class BlogOneSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = BlogOne
-        fields = ('name', 'info', )
+        fields = ('name', 'slug', 'info')
 
 
 class BlogTwoSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = BlogTwo
-        fields = ('name', )
+        fields = ('name', 'slug')
 
 
 class BlogPolymorphicSerializer(PolymorphicSerializer):

tests/test_serializers.py

@@ -44,16 +44,18 @@ def test_each_serializer_has_context(self, mocker):
             assert inner_serializer.context == context
 
     def test_serialize(self):
-        instance = BlogBase.objects.create(name='blog')
+        instance = BlogBase.objects.create(name='blog', slug='blog')
         serializer = BlogPolymorphicSerializer(instance)
         assert serializer.data == {
             'name': 'blog',
+            'slug': 'blog',
             'resourcetype': 'BlogBase',
         }
 
     def test_deserialize(self):
         data = {
             'name': 'blog',
+            'slug': 'blog',
             'resourcetype': 'BlogBase',
         }
         serializers = BlogPolymorphicSerializer(data=data)
@@ -72,15 +74,18 @@ def test_create(self):
         data = [
             {
                 'name': 'a',
+                'slug': 'a',
                 'resourcetype': 'BlogBase'
             },
             {
                 'name': 'b',
+                'slug': 'b',
                 'info': 'info',
                 'resourcetype': 'BlogOne'
             },
             {
                 'name': 'c',
+                'slug': 'c',
                 'resourcetype': 'BlogTwo'
             },
         ]
@@ -98,9 +103,10 @@ def test_create(self):
         assert serializer.data == data
 
     def test_update(self):
-        instance = BlogBase.objects.create(name='blog')
+        instance = BlogBase.objects.create(name='blog', slug='blog')
         data = {
             'name': 'new-blog',
+            'slug': 'blog',
             'resourcetype': 'BlogBase'
         }
 
@@ -109,3 +115,20 @@ def test_update(self):
 
         serializer.save()
         assert instance.name == 'new-blog'
+        assert instance.slug == 'blog'
+
+    def test_partial_update(self):
+        instance = BlogBase.objects.create(name='blog', slug='blog')
+        data = {
+            'name': 'new-blog',
+            'resourcetype': 'BlogBase'
+        }
+
+        serializer = BlogPolymorphicSerializer(
+            instance, data=data, partial=True
+        )
+        assert serializer.is_valid()
+
+        serializer.save()
+        assert instance.name == 'new-blog'
+        assert instance.slug == 'blog'