Merge branch 'version-3.1' into oauth_as_package

Conflicts:
	requirements-test.txt
	rest_framework/compat.py
	tests/settings.py
	tox.ini

1 files changed, 53 insertions, 53 deletions

diff --git a/tests/test_permissions.py b/tests/test_permissions.py
index ac398f80..97bac33d 100644
--- a/tests/test_permissions.py
+++ b/tests/test_permissions.py
@@ -95,59 +95,59 @@ class ModelPermissionsIntegrationTests(TestCase):
         response = instance_view(request, pk=1)
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-    # def test_options_permitted(self):
-    #     request = factory.options(
-    #         '/',
-    #         HTTP_AUTHORIZATION=self.permitted_credentials
-    #     )
-    #     response = root_view(request, pk='1')
-    #     self.assertEqual(response.status_code, status.HTTP_200_OK)
-    #     self.assertIn('actions', response.data)
-    #     self.assertEqual(list(response.data['actions'].keys()), ['POST'])
-
-    #     request = factory.options(
-    #         '/1',
-    #         HTTP_AUTHORIZATION=self.permitted_credentials
-    #     )
-    #     response = instance_view(request, pk='1')
-    #     self.assertEqual(response.status_code, status.HTTP_200_OK)
-    #     self.assertIn('actions', response.data)
-    #     self.assertEqual(list(response.data['actions'].keys()), ['PUT'])
-
-    # def test_options_disallowed(self):
-    #     request = factory.options(
-    #         '/',
-    #         HTTP_AUTHORIZATION=self.disallowed_credentials
-    #     )
-    #     response = root_view(request, pk='1')
-    #     self.assertEqual(response.status_code, status.HTTP_200_OK)
-    #     self.assertNotIn('actions', response.data)
-
-    #     request = factory.options(
-    #         '/1',
-    #         HTTP_AUTHORIZATION=self.disallowed_credentials
-    #     )
-    #     response = instance_view(request, pk='1')
-    #     self.assertEqual(response.status_code, status.HTTP_200_OK)
-    #     self.assertNotIn('actions', response.data)
-
-    # def test_options_updateonly(self):
-    #     request = factory.options(
-    #         '/',
-    #         HTTP_AUTHORIZATION=self.updateonly_credentials
-    #     )
-    #     response = root_view(request, pk='1')
-    #     self.assertEqual(response.status_code, status.HTTP_200_OK)
-    #     self.assertNotIn('actions', response.data)
-
-    #     request = factory.options(
-    #         '/1',
-    #         HTTP_AUTHORIZATION=self.updateonly_credentials
-    #     )
-    #     response = instance_view(request, pk='1')
-    #     self.assertEqual(response.status_code, status.HTTP_200_OK)
-    #     self.assertIn('actions', response.data)
-    #     self.assertEqual(list(response.data['actions'].keys()), ['PUT'])
+    def test_options_permitted(self):
+        request = factory.options(
+            '/',
+            HTTP_AUTHORIZATION=self.permitted_credentials
+        )
+        response = root_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEqual(list(response.data['actions'].keys()), ['POST'])
+
+        request = factory.options(
+            '/1',
+            HTTP_AUTHORIZATION=self.permitted_credentials
+        )
+        response = instance_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEqual(list(response.data['actions'].keys()), ['PUT'])
+
+    def test_options_disallowed(self):
+        request = factory.options(
+            '/',
+            HTTP_AUTHORIZATION=self.disallowed_credentials
+        )
+        response = root_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertNotIn('actions', response.data)
+
+        request = factory.options(
+            '/1',
+            HTTP_AUTHORIZATION=self.disallowed_credentials
+        )
+        response = instance_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertNotIn('actions', response.data)
+
+    def test_options_updateonly(self):
+        request = factory.options(
+            '/',
+            HTTP_AUTHORIZATION=self.updateonly_credentials
+        )
+        response = root_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertNotIn('actions', response.data)
+
+        request = factory.options(
+            '/1',
+            HTTP_AUTHORIZATION=self.updateonly_credentials
+        )
+        response = instance_view(request, pk='1')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('actions', response.data)
+        self.assertEqual(list(response.data['actions'].keys()), ['PUT'])
 
 
 class BasicPermModel(models.Model):