encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-21 21:49:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix PendingDeprecation warnings in tests

Browse Source
This commit is contained in:
Tom Christie 2013-05-17 21:57:11 +01:00
parent 14ded26167
commit b6fb377c2b
3 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/tests/filters.py
View File

@ -24,7 +24,7 @@ if django_filters:
class FilterFieldsRootView(generics.ListCreateAPIView): class FilterFieldsRootView(generics.ListCreateAPIView):
model = FilterableItem model = FilterableItem
filter_fields = ['decimal', 'date'] filter_fields = ['decimal', 'date']
filter_backend = filters.DjangoFilterBackend filter_backends = (filters.DjangoFilterBackend,)
# These class are used to test a filter class. # These class are used to test a filter class.
class SeveralFieldsFilter(django_filters.FilterSet): class SeveralFieldsFilter(django_filters.FilterSet):
@ -39,7 +39,7 @@ if django_filters:
class FilterClassRootView(generics.ListCreateAPIView): class FilterClassRootView(generics.ListCreateAPIView):
model = FilterableItem model = FilterableItem
filter_class = SeveralFieldsFilter filter_class = SeveralFieldsFilter
filter_backend = filters.DjangoFilterBackend filter_backends = (filters.DjangoFilterBackend,)
# These classes are used to test a misconfigured filter class. # These classes are used to test a misconfigured filter class.
class MisconfiguredFilter(django_filters.FilterSet): class MisconfiguredFilter(django_filters.FilterSet):
@ -52,12 +52,12 @@ if django_filters:
class IncorrectlyConfiguredRootView(generics.ListCreateAPIView): class IncorrectlyConfiguredRootView(generics.ListCreateAPIView):
model = FilterableItem model = FilterableItem
filter_class = MisconfiguredFilter filter_class = MisconfiguredFilter
filter_backend = filters.DjangoFilterBackend filter_backends = (filters.DjangoFilterBackend,)
class FilterClassDetailView(generics.RetrieveAPIView): class FilterClassDetailView(generics.RetrieveAPIView):
model = FilterableItem model = FilterableItem
filter_class = SeveralFieldsFilter filter_class = SeveralFieldsFilter
filter_backend = filters.DjangoFilterBackend filter_backends = (filters.DjangoFilterBackend,)
# Regression test for #814 # Regression test for #814
class FilterableItemSerializer(serializers.ModelSerializer): class FilterableItemSerializer(serializers.ModelSerializer):
@ -68,12 +68,12 @@ if django_filters:
queryset = FilterableItem.objects.all() queryset = FilterableItem.objects.all()
serializer_class = FilterableItemSerializer serializer_class = FilterableItemSerializer
filter_fields = ['decimal', 'date'] filter_fields = ['decimal', 'date']
filter_backend = filters.DjangoFilterBackend filter_backends = (filters.DjangoFilterBackend,)
class GetQuerysetView(generics.ListCreateAPIView): class GetQuerysetView(generics.ListCreateAPIView):
serializer_class = FilterableItemSerializer serializer_class = FilterableItemSerializer
filter_class = SeveralFieldsFilter filter_class = SeveralFieldsFilter
filter_backend = filters.DjangoFilterBackend filter_backends = (filters.DjangoFilterBackend,)
def get_queryset(self): def get_queryset(self):
return FilterableItem.objects.all() return FilterableItem.objects.all()

25
rest_framework/tests/generics.py
View File

@ -39,6 +39,7 @@ class SlugBasedInstanceView(InstanceView):
""" """
model = SlugBasedModel model = SlugBasedModel
serializer_class = SlugSerializer serializer_class = SlugSerializer
lookup_field = 'slug'
class TestRootView(TestCase): class TestRootView(TestCase):
@ -434,22 +435,14 @@ class TestFilterBackendAppliedToViews(TestCase):
{'id': obj.id, 'text': obj.text} {'id': obj.id, 'text': obj.text}
for obj in self.objects.all() for obj in self.objects.all()
] ]
self.root_view = RootView.as_view()
self.instance_view = InstanceView.as_view()
self.original_root_backend = getattr(RootView, 'filter_backend')
self.original_instance_backend = getattr(InstanceView, 'filter_backend')
def tearDown(self):
setattr(RootView, 'filter_backend', self.original_root_backend)
setattr(InstanceView, 'filter_backend', self.original_instance_backend)
def test_get_root_view_filters_by_name_with_filter_backend(self): def test_get_root_view_filters_by_name_with_filter_backend(self):
""" """
GET requests to ListCreateAPIView should return filtered list. GET requests to ListCreateAPIView should return filtered list.
""" """
setattr(RootView, 'filter_backend', InclusiveFilterBackend) root_view = RootView.as_view(filter_backends=(InclusiveFilterBackend,))
request = factory.get('/') request = factory.get('/')
response = self.root_view(request).render() response = root_view(request).render()
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(len(response.data), 1) self.assertEqual(len(response.data), 1)
self.assertEqual(response.data, [{'id': 1, 'text': 'foo'}]) self.assertEqual(response.data, [{'id': 1, 'text': 'foo'}])
@ -458,9 +451,9 @@ class TestFilterBackendAppliedToViews(TestCase):
""" """
GET requests to ListCreateAPIView should return empty list when all models are filtered out. GET requests to ListCreateAPIView should return empty list when all models are filtered out.
""" """
setattr(RootView, 'filter_backend', ExclusiveFilterBackend) root_view = RootView.as_view(filter_backends=(ExclusiveFilterBackend,))
request = factory.get('/') request = factory.get('/')
response = self.root_view(request).render() response = root_view(request).render()
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data, []) self.assertEqual(response.data, [])
@ -468,9 +461,9 @@ class TestFilterBackendAppliedToViews(TestCase):
""" """
GET requests to RetrieveUpdateDestroyAPIView should raise 404 when model filtered out. GET requests to RetrieveUpdateDestroyAPIView should raise 404 when model filtered out.
""" """
setattr(InstanceView, 'filter_backend', ExclusiveFilterBackend) instance_view = InstanceView.as_view(filter_backends=(ExclusiveFilterBackend,))
request = factory.get('/1') request = factory.get('/1')
response = self.instance_view(request, pk=1).render() response = instance_view(request, pk=1).render()
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND) self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
self.assertEqual(response.data, {'detail': 'Not found'}) self.assertEqual(response.data, {'detail': 'Not found'})
@ -478,8 +471,8 @@ class TestFilterBackendAppliedToViews(TestCase):
""" """
GET requests to RetrieveUpdateDestroyAPIView should return a single object when not excluded GET requests to RetrieveUpdateDestroyAPIView should return a single object when not excluded
""" """
setattr(InstanceView, 'filter_backend', InclusiveFilterBackend) instance_view = InstanceView.as_view(filter_backends=(InclusiveFilterBackend,))
request = factory.get('/1') request = factory.get('/1')
response = self.instance_view(request, pk=1).render() response = instance_view(request, pk=1).render()
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data, {'id': 1, 'text': 'foo'}) self.assertEqual(response.data, {'id': 1, 'text': 'foo'})

4
rest_framework/tests/pagination.py
View File

@ -130,7 +130,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):
model = FilterableItem model = FilterableItem
paginate_by = 10 paginate_by = 10
filter_class = DecimalFilter filter_class = DecimalFilter
filter_backend = filters.DjangoFilterBackend filter_backends = (filters.DjangoFilterBackend,)
view = FilterFieldsRootView.as_view() view = FilterFieldsRootView.as_view()
@ -177,7 +177,7 @@ class IntegrationTestPaginationAndFiltering(TestCase):
class BasicFilterFieldsRootView(generics.ListCreateAPIView): class BasicFilterFieldsRootView(generics.ListCreateAPIView):
model = FilterableItem model = FilterableItem
paginate_by = 10 paginate_by = 10
filter_backend = DecimalFilterBackend filter_backends = (DecimalFilterBackend,)
view = BasicFilterFieldsRootView.as_view() view = BasicFilterFieldsRootView.as_view()