Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 7e4b239

Browse files
committed
Merge branch 'develop' into feature/utils_overrides
2 parents fb16264 + 0ceeddd commit 7e4b239

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

‎example/tests/unit/test_utils.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,35 @@
11
import pytest
2-
from django.utils import six
32
from django.conf import settings
43
from django.contrib.auth import get_user_model
4+
from django.utils import six
55
from rest_framework import serializers
6+
from rest_framework.generics import GenericAPIView
67
from rest_framework.response import Response
78
from rest_framework.views import APIView
89

9-
from rest_framework_json_api import utils
1010
from example.serializers import (EntrySerializer, BlogSerializer,
1111
AuthorSerializer, CommentSerializer)
12+
from rest_framework_json_api import utils
1213
from rest_framework_json_api.utils import get_included_serializers
1314

1415
pytestmark = pytest.mark.django_db
1516

1617

17-
class ResourceView(APIView):
18-
pass
19-
20-
2118
class ResourceSerializer(serializers.ModelSerializer):
2219
class Meta:
2320
fields = ('username',)
2421
model = get_user_model()
2522

2623

2724
def test_get_resource_name():
28-
view = ResourceView()
25+
view = APIView()
2926
context = {'view': view}
3027
setattr(settings, 'JSON_API_FORMAT_RELATION_KEYS', None)
31-
assert 'ResourceViews' == utils.get_resource_name(context), 'not formatted'
28+
assert 'APIViews' == utils.get_resource_name(context), 'not formatted'
3229

33-
view = ResourceView()
3430
context = {'view': view}
3531
setattr(settings, 'JSON_API_FORMAT_RELATION_KEYS', 'dasherize')
36-
assert 'resource-views' == utils.get_resource_name(context), 'derived from view'
32+
assert 'api-views' == utils.get_resource_name(context), 'derived from view'
3733

3834
view.model = get_user_model()
3935
assert 'users' == utils.get_resource_name(context), 'derived from view model'
@@ -47,9 +43,9 @@ def test_get_resource_name():
4743
view.response = Response(status=500)
4844
assert 'errors' == utils.get_resource_name(context), 'handles 500 error'
4945

50-
view = ResourceView()
51-
context = {'view': view}
46+
view = GenericAPIView()
5247
view.serializer_class = ResourceSerializer
48+
context = {'view': view}
5349
assert 'users' == utils.get_resource_name(context), 'derived from serializer'
5450

5551
view.serializer_class.Meta.resource_name = 'rcustom'

‎rest_framework_json_api/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get_resource_name(context):
4646
resource_name = getattr(view, 'resource_name')
4747
except AttributeError:
4848
try:
49-
serializer = getattr(view, 'serializer_diff-b73c12f53b5c9608ae9e003be9082edac194580fef971163c0a99f0b6912bd15-49-49-0" data-selected="false" role="gridcell" tabindex="-1">
49+
serializer = view.get_serializer_class()
5050
return get_resource_type_from_serializer(serializer)
5151
except AttributeError:
5252
try:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /