Merge remote-tracking branch 'origin/master' into feature/merge_master

mayan/apps/documents/tests/test_api.py

@@ -9,6 +9,8 @@ from json import loads
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
 from django.test import override_settings
+from django.utils.encoding import force_text
+from django.utils.six import BytesIO
 
 from django_downloadview import assert_download_response
 from rest_framework import status
@@ -48,12 +50,13 @@ class DocumentTypeAPITestCase(APITestCase):
     def test_document_type_create(self):
         self.assertEqual(DocumentType.objects.all().count(), 0)
 
-        self.client.post(
+        response = self.client.post(
             reverse('rest_api:documenttype-list'), data={
                 'label': TEST_DOCUMENT_TYPE
             }
         )
 
+        self.assertEqual(response.status_code, 201)
         self.assertEqual(DocumentType.objects.all().count(), 1)
         self.assertEqual(
             DocumentType.objects.all().first().label, TEST_DOCUMENT_TYPE
@@ -93,10 +96,6 @@ class DocumentTypeAPITestCase(APITestCase):
 
 @override_settings(OCR_AUTO_OCR=False)
 class DocumentAPITestCase(APITestCase):
-    """
-    Test document API endpoints
-    """
-
     def setUp(self):
         self.admin_user = get_user_model().objects.create_superuser(
             username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL,
@@ -155,51 +154,6 @@ class DocumentAPITestCase(APITestCase):
         )
         self.assertEqual(document.page_count, 47)
 
-    def test_document_move_to_trash(self):
-        with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
-            document = self.document_type.new_document(
-                file_object=file_object,
-            )
-
-        self.client.delete(
-            reverse('rest_api:document-detail', args=(document.pk,))
-        )
-
-        self.assertEqual(Document.objects.count(), 0)
-        self.assertEqual(Document.trash.count(), 1)
-
-    def test_deleted_document_delete_from_trash(self):
-        with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
-            document = self.document_type.new_document(
-                file_object=file_object,
-            )
-
-        document.delete()
-
-        self.assertEqual(Document.objects.count(), 0)
-        self.assertEqual(Document.trash.count(), 1)
-
-        self.client.delete(
-            reverse('rest_api:trasheddocument-detail', args=(document.pk,))
-        )
-
-        self.assertEqual(Document.trash.count(), 0)
-
-    def test_deleted_document_restore(self):
-        with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
-            document = self.document_type.new_document(
-                file_object=file_object,
-            )
-
-        document.delete()
-
-        self.client.post(
-            reverse('rest_api:trasheddocument-restore', args=(document.pk,))
-        )
-
-        self.assertEqual(Document.trash.count(), 0)
-        self.assertEqual(Document.objects.count(), 1)
-
     def test_document_new_version_upload(self):
         with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
             document = self.document_type.new_document(
@@ -367,5 +321,88 @@ class DocumentAPITestCase(APITestCase):
             TEST_DOCUMENT_DESCRIPTION_EDITED
         )
 
+
+@override_settings(OCR_AUTO_OCR=False)
+class TrashedDocumentAPITestCase(APITestCase):
+    def setUp(self):
+        self.admin_user = get_user_model().objects.create_superuser(
+            username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL,
+            password=TEST_ADMIN_PASSWORD
+        )
+
+        self.client.login(
+            username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD
+        )
+
+        self.document_type = DocumentType.objects.create(
+            label=TEST_DOCUMENT_TYPE
+        )
+
+    def tearDown(self):
+        self.admin_user.delete()
+        self.document_type.delete()
+
+    def _upload_document(self):
+        with open(TEST_SMALL_DOCUMENT_PATH) as file_object:
+            document = self.document_type.new_document(
+                file_object=file_object,
+            )
+
+        return document
+
+    def test_document_move_to_trash(self):
+        document = self._upload_document()
+
+        self.client.delete(
+            reverse('rest_api:document-detail', args=(document.pk,))
+        )
+
+        self.assertEqual(Document.objects.count(), 0)
+        self.assertEqual(Document.trash.count(), 1)
+
+    def test_trashed_document_delete_from_trash(self):
+        document = self._upload_document()
+        document.delete()
+
+        self.assertEqual(Document.objects.count(), 0)
+        self.assertEqual(Document.trash.count(), 1)
+
+        self.client.delete(
+            reverse('rest_api:trasheddocument-detail', args=(document.pk,))
+        )
+
+        self.assertEqual(Document.trash.count(), 0)
+
+    def test_trashed_document_detail_view(self):
+        document = self._upload_document()
+        document.delete()
+
+        response = self.client.get(
+            reverse('rest_api:trasheddocument-detail', args=(document.pk,))
+        )
+
+        self.assertEqual(response.data['uuid'], force_text(document.uuid))
+
+    def test_trashed_document_list_view(self):
+        document = self._upload_document()
+        document.delete()
+
+        response = self.client.get(
+            reverse('rest_api:trasheddocument-list')
+        )
+
+        self.assertEqual(response.data['results'][0]['uuid'], force_text(document.uuid))
+
+    def test_trashed_document_restore(self):
+        document = self._upload_document()
+        document.delete()
+
+        self.client.post(
+            reverse('rest_api:trasheddocument-restore', args=(document.pk,))
+        )
+
+        self.assertEqual(Document.trash.count(), 0)
+        self.assertEqual(Document.objects.count(), 1)
+
     # TODO: def test_document_set_document_type(self):
     #    pass