mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-11 04:07:39 +03:00
Merge branch 'brandoncazander-version-3.1-2489' into version-3.1
This commit is contained in:
commit
65bbc4a159
|
@ -1,7 +1,7 @@
|
|||
# coding: utf-8
|
||||
from __future__ import unicode_literals
|
||||
from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured
|
||||
from django.core.urlresolvers import resolve, get_script_prefix, NoReverseMatch, Resolver404
|
||||
from django.core.urlresolvers import get_script_prefix, resolve, NoReverseMatch, Resolver404
|
||||
from django.db.models.query import QuerySet
|
||||
from django.utils import six
|
||||
from django.utils.encoding import smart_text
|
||||
|
@ -167,11 +167,10 @@ class HyperlinkedRelatedField(RelatedField):
|
|||
self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field)
|
||||
self.format = kwargs.pop('format', None)
|
||||
|
||||
# We include these simply for dependency injection in tests.
|
||||
# We can't add them as class attributes or they would expect an
|
||||
# We include this simply for dependency injection in tests.
|
||||
# We can't add it as a class attributes or it would expect an
|
||||
# implicit `self` argument to be passed.
|
||||
self.reverse = reverse
|
||||
self.resolve = resolve
|
||||
|
||||
super(HyperlinkedRelatedField, self).__init__(**kwargs)
|
||||
|
||||
|
@ -205,6 +204,7 @@ class HyperlinkedRelatedField(RelatedField):
|
|||
return self.reverse(view_name, kwargs=kwargs, request=request, format=format)
|
||||
|
||||
def to_internal_value(self, data):
|
||||
request = self.context.get('request', None)
|
||||
try:
|
||||
http_prefix = data.startswith(('http:', 'https:'))
|
||||
except AttributeError:
|
||||
|
@ -218,11 +218,18 @@ class HyperlinkedRelatedField(RelatedField):
|
|||
data = '/' + data[len(prefix):]
|
||||
|
||||
try:
|
||||
match = self.resolve(data)
|
||||
match = resolve(data)
|
||||
except Resolver404:
|
||||
self.fail('no_match')
|
||||
|
||||
if match.view_name != self.view_name:
|
||||
try:
|
||||
expected_viewname = request.versioning_scheme.get_versioned_viewname(
|
||||
self.view_name, request
|
||||
)
|
||||
except AttributeError:
|
||||
expected_viewname = self.view_name
|
||||
|
||||
if match.view_name != expected_viewname:
|
||||
self.fail('incorrect_match')
|
||||
|
||||
try:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Provide reverse functions that return fully qualified URLs
|
||||
Provide urlresolver functions that return fully qualified URLs or view names
|
||||
"""
|
||||
from __future__ import unicode_literals
|
||||
from django.core.urlresolvers import reverse as django_reverse
|
||||
|
|
|
@ -122,11 +122,14 @@ class NamespaceVersioning(BaseVersioning):
|
|||
|
||||
def reverse(self, viewname, args=None, kwargs=None, request=None, format=None, **extra):
|
||||
if request.version is not None:
|
||||
viewname = request.version + ':' + viewname
|
||||
viewname = self.get_versioned_viewname(viewname, request)
|
||||
return super(NamespaceVersioning, self).reverse(
|
||||
viewname, args, kwargs, request, format, **extra
|
||||
)
|
||||
|
||||
def get_versioned_viewname(self, viewname, request):
|
||||
return request.version + ':' + viewname
|
||||
|
||||
|
||||
class HostNameVersioning(BaseVersioning):
|
||||
"""
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
from __future__ import unicode_literals
|
||||
from django.conf.urls import patterns, url
|
||||
from django.conf.urls import url
|
||||
from django.test import TestCase
|
||||
from rest_framework import serializers
|
||||
from rest_framework.test import APIRequestFactory
|
||||
|
@ -14,8 +14,7 @@ request = factory.get('/') # Just to ensure we have a request in the serializer
|
|||
|
||||
dummy_view = lambda request, pk: None
|
||||
|
||||
urlpatterns = patterns(
|
||||
'',
|
||||
urlpatterns = [
|
||||
url(r'^dummyurl/(?P<pk>[0-9]+)/$', dummy_view, name='dummy-url'),
|
||||
url(r'^manytomanysource/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanysource-detail'),
|
||||
url(r'^manytomanytarget/(?P<pk>[0-9]+)/$', dummy_view, name='manytomanytarget-detail'),
|
||||
|
@ -24,7 +23,7 @@ urlpatterns = patterns(
|
|||
url(r'^nullableforeignkeysource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableforeignkeysource-detail'),
|
||||
url(r'^onetoonetarget/(?P<pk>[0-9]+)/$', dummy_view, name='onetoonetarget-detail'),
|
||||
url(r'^nullableonetoonesource/(?P<pk>[0-9]+)/$', dummy_view, name='nullableonetoonesource-detail'),
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
# ManyToMany
|
||||
|
|
|
@ -1,9 +1,14 @@
|
|||
from .utils import MockObject, MockQueryset, UsingURLPatterns
|
||||
from django.conf.urls import include, url
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from rest_framework import serializers
|
||||
from rest_framework import status, versioning
|
||||
from rest_framework.decorators import APIView
|
||||
from rest_framework.response import Response
|
||||
from rest_framework.reverse import reverse
|
||||
from rest_framework.test import APIRequestFactory, APITestCase
|
||||
from rest_framework.versioning import NamespaceVersioning
|
||||
import pytest
|
||||
|
||||
|
||||
class RequestVersionView(APIView):
|
||||
|
@ -29,16 +34,7 @@ class RequestInvalidVersionView(APIView):
|
|||
factory = APIRequestFactory()
|
||||
|
||||
mock_view = lambda request: None
|
||||
|
||||
included_patterns = [
|
||||
url(r'^namespaced/$', mock_view, name='another'),
|
||||
]
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^v1/', include(included_patterns, namespace='v1')),
|
||||
url(r'^another/$', mock_view, name='another'),
|
||||
url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another')
|
||||
]
|
||||
dummy_view = lambda request, pk: None
|
||||
|
||||
|
||||
class TestRequestVersion:
|
||||
|
@ -114,8 +110,17 @@ class TestRequestVersion:
|
|||
assert response.data == {'version': None}
|
||||
|
||||
|
||||
class TestURLReversing(APITestCase):
|
||||
urls = 'tests.test_versioning'
|
||||
class TestURLReversing(UsingURLPatterns, APITestCase):
|
||||
included = [
|
||||
url(r'^namespaced/$', mock_view, name='another'),
|
||||
url(r'^example/(?P<pk>\d+)/$', dummy_view, name='example-detail')
|
||||
]
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^v1/', include(included, namespace='v1')),
|
||||
url(r'^another/$', mock_view, name='another'),
|
||||
url(r'^(?P<version>[^/]+)/another/$', mock_view, name='another'),
|
||||
]
|
||||
|
||||
def test_reverse_unversioned(self):
|
||||
view = ReverseView.as_view()
|
||||
|
@ -221,3 +226,43 @@ class TestInvalidVersion:
|
|||
request.resolver_match = FakeResolverMatch
|
||||
response = view(request, version='v3')
|
||||
assert response.status_code == status.HTTP_404_NOT_FOUND
|
||||
|
||||
|
||||
class TestHyperlinkedRelatedField(UsingURLPatterns, APITestCase):
|
||||
included = [
|
||||
url(r'^namespaced/(?P<pk>\d+)/$', mock_view, name='namespaced'),
|
||||
]
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^v1/', include(included, namespace='v1')),
|
||||
url(r'^v2/', include(included, namespace='v2'))
|
||||
]
|
||||
|
||||
def setUp(self):
|
||||
super(TestHyperlinkedRelatedField, self).setUp()
|
||||
|
||||
class HyperlinkedMockQueryset(MockQueryset):
|
||||
def get(self, **lookup):
|
||||
for item in self.items:
|
||||
if item.pk == int(lookup.get('pk', -1)):
|
||||
return item
|
||||
raise ObjectDoesNotExist()
|
||||
|
||||
self.queryset = HyperlinkedMockQueryset([
|
||||
MockObject(pk=1, name='foo'),
|
||||
MockObject(pk=2, name='bar'),
|
||||
MockObject(pk=3, name='baz')
|
||||
])
|
||||
self.field = serializers.HyperlinkedRelatedField(
|
||||
view_name='namespaced',
|
||||
queryset=self.queryset
|
||||
)
|
||||
request = factory.post('/', urlconf='tests.test_versioning')
|
||||
request.versioning_scheme = NamespaceVersioning()
|
||||
request.version = 'v1'
|
||||
self.field._context = {'request': request}
|
||||
|
||||
def test_bug_2489(self):
|
||||
self.field.to_internal_value('/v1/namespaced/3/')
|
||||
with pytest.raises(serializers.ValidationError):
|
||||
self.field.to_internal_value('/v2/namespaced/3/')
|
||||
|
|
|
@ -2,6 +2,30 @@ from django.core.exceptions import ObjectDoesNotExist
|
|||
from django.core.urlresolvers import NoReverseMatch
|
||||
|
||||
|
||||
class UsingURLPatterns(object):
|
||||
"""
|
||||
Isolates URL patterns used during testing on the test class itself.
|
||||
For example:
|
||||
|
||||
class MyTestCase(UsingURLPatterns, TestCase):
|
||||
urlpatterns = [
|
||||
...
|
||||
]
|
||||
|
||||
def test_something(self):
|
||||
...
|
||||
"""
|
||||
urls = __name__
|
||||
|
||||
def setUp(self):
|
||||
global urlpatterns
|
||||
urlpatterns = self.urlpatterns
|
||||
|
||||
def tearDown(self):
|
||||
global urlpatterns
|
||||
urlpatterns = []
|
||||
|
||||
|
||||
class MockObject(object):
|
||||
def __init__(self, **kwargs):
|
||||
self._kwargs = kwargs
|
||||
|
|
Loading…
Reference in New Issue
Block a user