Convert non paginated response test to use APIClient

Author: Oliver Sauder

example/tests/conftest.py

@@ -1,6 +1,6 @@
 import pytest
 from pytest_factoryboy import register
-from rest_framework.test import APIClient, APIRequestFactory
+from rest_framework.test import APIClient
 
 from example.factories import (
     ArtProjectFactory,
@@ -62,8 +62,3 @@ def single_art_project(art_project_factory):
 @pytest.fixture
 def client():
     return APIClient()
-
-
-@pytest.fixture
-def rf():
-    return APIRequestFactory()

example/tests/integration/test_non_paginated_responses.py

@@ -1,11 +1,6 @@
 import pytest
 from django.core.urlresolvers import reverse
 
-from rest_framework_json_api.pagination import PageNumberPagination
-
-from example.tests.utils import load_json
-from example.views import EntryViewSet
-
 try:
     from unittest import mock
 except ImportError:
@@ -14,12 +9,11 @@
 pytestmark = pytest.mark.django_db
 
 
-# rf == request_factory
 @mock.patch(
     'rest_framework_json_api.utils'
     '.get_default_included_resources_from_serializer',
     new=lambda s: [])
-def test_multiple_entries_no_pagination(multiple_entries, rf):
+def test_multiple_entries_no_pagination(multiple_entries, client):
 
     expected = {
         "data": [
@@ -102,17 +96,6 @@ def test_multiple_entries_no_pagination(multiple_entries, rf):
         ]
     }
 
-    class NoPagination(PageNumberPagination):
-        page_size = None
-
-    class NonPaginatedEntryViewSet(EntryViewSet):
-        pagination_class = NoPagination
-
-    request = rf.get(reverse("entry-list"))
-    view = NonPaginatedEntryViewSet.as_view({'get': 'list'})
-    response = view(request)
-    response.render()
-
-    parsed_content = load_json(response.content)
+    response = client.get(reverse("nopage-entry-list"))
 
-    assert expected == parsed_content
+    assert expected == response.json()

example/tests/utils.py

@@ -12,13 +12,15 @@
     CompanyViewset,
     EntryRelationshipView,
     EntryViewSet,
+    NonPaginatedEntryViewSet,
     ProjectViewset
 )
 
 router = routers.DefaultRouter(trailing_slash=False)
 
 router.register(r'blogs', BlogViewSet)
 router.register(r'entries', EntryViewSet)
+router.register(r'nopage-entries', NonPaginatedEntryViewSet, 'nopage-entry')
 router.register(r'authors', AuthorViewSet)
 router.register(r'comments', CommentViewSet)
 router.register(r'companies', CompanyViewset)

example/urls_test.py

@@ -5,6 +5,7 @@
 import rest_framework_json_api.metadata
 import rest_framework_json_api.parsers
 import rest_framework_json_api.renderers
+from rest_framework_json_api.pagination import PageNumberPagination
 from rest_framework_json_api.utils import format_drf_errors
 from rest_framework_json_api.views import ModelViewSet, RelationshipView
 
@@ -68,6 +69,14 @@ def get_serializer_class(self):
         return EntrySerializer
 
 
+class NoPagination(PageNumberPagination):
+    page_size = None
+
+
+class NonPaginatedEntryViewSet(EntryViewSet):
+    pagination_class = NoPagination
+
+
 class AuthorViewSet(ModelViewSet):
     queryset = Author.objects.all()
     serializer_class = AuthorSerializer