cleaned up tests

Author: scottfisk

example/models.py

@@ -34,18 +34,6 @@ def __str__(self):
         return self.name
 
 
-@python_2_unicode_compatible
-class RenamedAuthor(Author):
-    class Meta:
-        proxy = True
-
-    class JSONAPIMeta:
-        resource_name = "super-author"
-
-    def __str__(self):
-        return self.name
-
-
 @python_2_unicode_compatible
 class Entry(BaseModel):
     blog = models.ForeignKey(Blog)

example/serializers.py

@@ -1,5 +1,5 @@
 from rest_framework_json_api import serializers, relations
-from example.models import Blog, Entry, Author, Comment, RenamedAuthor
+from example.models import Blog, Entry, Author, Comment
 
 
 class BlogSerializer(serializers.ModelSerializer):
@@ -35,7 +35,7 @@ def get_suggested(self, obj):
     class Meta:
         model = Entry
         fields = ('blog', 'headline', 'body_text', 'pub_date', 'mod_date',
-                'authors', 'comments', 'suggested',)
+                  'authors', 'comments', 'suggested',)
 
 
 class AuthorSerializer(serializers.ModelSerializer):
@@ -45,13 +45,6 @@ class Meta:
         fields = ('name', 'email',)
 
 
-class RenamedAuthorSerializer(serializers.ModelSerializer):
-
-    class Meta:
-        model = RenamedAuthor
-        fields = ('name', 'email',)
-
-
 class CommentSerializer(serializers.ModelSerializer):
 
     class Meta:

example/tests/integration/test_model_resource_name.py

@@ -8,20 +8,27 @@
 pytestmark = pytest.mark.django_db
 
 
-def test_model_resource_name_on_list(single_entry, client):
-    response = client.get(reverse("renamed-authors-list"))
+class _PatchedModel:
+    class JSONAPIMeta:
+        resource_name = "resource_name_from_JSONAPIMeta"
+
+
+def test_match_model_resource_name_on_list(single_entry, client):
+    models.Comment.__bases__ += (_PatchedModel,)
+    response = client.get(reverse("comment-list"))
     data = load_json(response.content)['data']
     # name should be super-author instead of model name RenamedAuthor
-    assert [x.get('type') for x in data] == ['super-author'], 'List included types are incorrect'
+    assert [x.get('type') for x in data] == ['resource_name_from_JSONAPIMeta'], 'List included types are incorrect'
+
 
 @pytest.mark.usefixtures("single_entry")
 class ResourceNameConsistencyTest(APITestCase):
-    
+
     def test_type_match_on_included_and_inline_base(self):
         self._check_relationship_and_included_comment_type_are_the_same(reverse("entry-list"))
 
     def test_type_match_on_included_and_inline_with_JSONAPIMeta(self):
-        models.Comment.__bases__ += (self._PatchedModel,)
+        models.Comment.__bases__ += (_PatchedModel,)
 
         self._check_relationship_and_included_comment_type_are_the_same(reverse("entry-list"))
 
@@ -31,7 +38,7 @@ def test_type_match_on_included_and_inline_with_serializer_resource_name(self):
         self._check_relationship_and_included_comment_type_are_the_same(reverse("entry-list"))
 
     def test_type_match_on_included_and_inline_with_serializer_resource_name_and_JSONAPIMeta(self):
-        models.Comment.__bases__ += (self._PatchedModel,)
+        models.Comment.__bases__ += (_PatchedModel,)
         serializers.CommentSerializer.Meta.resource_name = "resource_name_from_serializer"
 
         self._check_relationship_and_included_comment_type_are_the_same(reverse("entry-list"))
@@ -45,12 +52,12 @@ def test_resource_and_relationship_type_match_with_serializer_resource_name(self
         self._check_resource_and_relationship_comment_type_match()
 
     def test_resource_and_relationship_type_match_with_JSONAPIMeta(self):
-        models.Comment.__bases__ += (self._PatchedModel,)
+        models.Comment.__bases__ += (_PatchedModel,)
 
         self._check_resource_and_relationship_comment_type_match()
 
     def test_resource_and_relationship_type_match_with_serializer_resource_name_and_JSONAPIMeta(self):
-        models.Comment.__bases__ += (self._PatchedModel,)
+        models.Comment.__bases__ += (_PatchedModel,)
         serializers.CommentSerializer.Meta.resource_name = "resource_name_from_serializer"
 
         self._check_resource_and_relationship_comment_type_match()
@@ -81,9 +88,3 @@ def tearDown(self):
             delattr(serializers.CommentSerializer.Meta, "resource_name")
         except AttributeError:
             pass
-
-    class _PatchedModel:
-
-        class JSONAPIMeta:
-            resource_name = "resource_name_from_JSONAPIMeta"
-            

example/urls_test.py

@@ -2,15 +2,14 @@
 from rest_framework import routers
 
 from example.views import BlogViewSet, EntryViewSet, AuthorViewSet, EntryRelationshipView, BlogRelationshipView, \
-    CommentRelationshipView, AuthorRelationshipView, RenamedAuthorViewSet, CommentViewSet
+    CommentRelationshipView, AuthorRelationshipView, CommentViewSet
 from .api.resources.identity import Identity, GenericIdentity
 
 router = routers.DefaultRouter(trailing_slash=False)
 
 router.register(r'blogs', BlogViewSet)
 router.register(r'entries', EntryViewSet)
 router.register(r'authors', AuthorViewSet)
-router.register(r'renamed-authors', RenamedAuthorViewSet, base_name='renamed-authors')
 router.register(r'comments', CommentViewSet)
 
 # for the old tests

example/views.py

@@ -1,9 +1,8 @@
 from rest_framework import viewsets
 from rest_framework_json_api.views import RelationshipView
-from example.models import Blog, Entry, Author, Comment, RenamedAuthor
+from example.models import Blog, Entry, Author, Comment
 from example.serializers import (
-        BlogSerializer, EntrySerializer, AuthorSerializer, CommentSerializer,
-        RenamedAuthorSerializer)
+        BlogSerializer, EntrySerializer, AuthorSerializer, CommentSerializer)
 
 
 class BlogViewSet(viewsets.ModelViewSet):
@@ -22,11 +21,6 @@ class AuthorViewSet(viewsets.ModelViewSet):
     serializer_class = AuthorSerializer
 
 
-class RenamedAuthorViewSet(viewsets.ModelViewSet):
-    queryset = RenamedAuthor.objects.all()
-    serializer_class = RenamedAuthorSerializer
-
-
 class CommentViewSet(viewsets.ModelViewSet):
     queryset = Comment.objects.all()
     serializer_class = CommentSerializer