diff options
| author | Tom Christie | 2013-05-17 21:57:11 +0100 | 
|---|---|---|
| committer | Tom Christie | 2013-05-17 21:57:11 +0100 | 
| commit | b6fb377c2b4b747597bc3291dadd52b633b135b4 (patch) | |
| tree | 70cc781bfb05b378efd6238c7e081b37ee469004 /rest_framework/tests/generics.py | |
| parent | 14ded26167b68aaf8316a6bf83b6be3e77c8bbd8 (diff) | |
| download | django-rest-framework-b6fb377c2b4b747597bc3291dadd52b633b135b4.tar.bz2 | |
Fix PendingDeprecation warnings in tests
Diffstat (limited to 'rest_framework/tests/generics.py')
| -rw-r--r-- | rest_framework/tests/generics.py | 25 | 
1 files changed, 9 insertions, 16 deletions
diff --git a/rest_framework/tests/generics.py b/rest_framework/tests/generics.py index eca50d82..2799d143 100644 --- a/rest_framework/tests/generics.py +++ b/rest_framework/tests/generics.py @@ -39,6 +39,7 @@ class SlugBasedInstanceView(InstanceView):      """      model = SlugBasedModel      serializer_class = SlugSerializer +    lookup_field = 'slug'  class TestRootView(TestCase): @@ -434,22 +435,14 @@ class TestFilterBackendAppliedToViews(TestCase):              {'id': obj.id, 'text': obj.text}              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):          """          GET requests to ListCreateAPIView should return filtered list.          """ -        setattr(RootView, 'filter_backend', InclusiveFilterBackend) +        root_view = RootView.as_view(filter_backends=(InclusiveFilterBackend,))          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(len(response.data), 1)          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.          """ -        setattr(RootView, 'filter_backend', ExclusiveFilterBackend) +        root_view = RootView.as_view(filter_backends=(ExclusiveFilterBackend,))          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.data, []) @@ -468,9 +461,9 @@ class TestFilterBackendAppliedToViews(TestCase):          """          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') -        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.data, {'detail': 'Not found'}) @@ -478,8 +471,8 @@ class TestFilterBackendAppliedToViews(TestCase):          """          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') -        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.data, {'id': 1, 'text': 'foo'})  | 
