Backport test improvements

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>

mayan/apps/django_gpg/tests/test_api.py

@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 
-from django.test import override_settings
-
 from rest_framework import status
 
 from mayan.apps.rest_api.tests import BaseAPITestCase
@@ -12,16 +10,10 @@ from ..permissions import (
 )
 
 from .literals import TEST_KEY_DATA, TEST_KEY_FINGERPRINT
+from .mixins import KeyTestMixin
 
 
-@override_settings(OCR_AUTO_OCR=False)
-class KeyAPITestCase(BaseAPITestCase):
-    def setUp(self):
-        super(KeyAPITestCase, self).setUp()
-        self.login_user()
-
-    def _create_key(self):
-        return Key.objects.create(key_data=TEST_KEY_DATA)
+class KeyAPITestCase(KeyTestMixin, BaseAPITestCase):
 
     # Key creation by upload
 
@@ -35,13 +27,13 @@ class KeyAPITestCase(BaseAPITestCase):
     def test_key_create_view_no_permission(self):
         response = self._request_key_create_view()
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
+
         self.assertEqual(Key.objects.all().count(), 0)
 
     def test_key_create_view_with_permission(self):
         self.grant_permission(permission=permission_key_upload)
 
         response = self._request_key_create_view()
-
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(response.data['fingerprint'], TEST_KEY_FINGERPRINT)
 
@@ -53,45 +45,49 @@ class KeyAPITestCase(BaseAPITestCase):
 
     def _request_key_delete_view(self):
         return self.delete(
-            viewname='rest_api:key-detail', args=(self.key.pk,)
+            viewname='rest_api:key-detail', kwargs={'pk': self.test_key.pk}
         )
 
     def test_key_delete_view_no_access(self):
-        self.key = self._create_key()
+        self._create_test_key()
+
         response = self._request_key_delete_view()
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
         self.assertEqual(Key.objects.count(), 1)
 
     def test_key_delete_view_with_access(self):
-        self.key = self._create_key()
+        self._create_test_key()
         self.grant_access(
-            permission=permission_key_delete, obj=self.key
+            obj=self.test_key, permission=permission_key_delete
         )
+
         response = self._request_key_delete_view()
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
         self.assertEqual(Key.objects.count(), 0)
 
     # Key detail
 
     def _request_key_detail_view(self):
         return self.get(
-            viewname='rest_api:key-detail', args=(self.key.pk,)
+            viewname='rest_api:key-detail', kwargs={'pk': self.test_key.pk}
         )
 
     def test_key_detail_view_no_access(self):
-        self.key = self._create_key()
-        response = self._request_key_detail_view()
+        self._create_test_key()
 
+        response = self._request_key_detail_view()
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_key_detail_view_with_access(self):
-        self.key = self._create_key()
+        self._create_test_key()
         self.grant_access(
-            permission=permission_key_view, obj=self.key
+            obj=self.test_key, permission=permission_key_view
         )
+
         response = self._request_key_detail_view()
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-
         self.assertEqual(
-            response.data['fingerprint'], self.key.fingerprint
+            response.data['fingerprint'], self.test_key.fingerprint
         )