From 1074e6f645ae0f5c55d3920940d0a76404bc5574 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 16 Oct 2019 20:13:22 -0400 Subject: [PATCH] Rename trashed documents test for clarity Signed-off-by: Roberto Rosario --- .../tests/test_trashed_document_views.py | 147 +++++++++--------- 1 file changed, 73 insertions(+), 74 deletions(-) diff --git a/mayan/apps/documents/tests/test_trashed_document_views.py b/mayan/apps/documents/tests/test_trashed_document_views.py index 51a51da737..0e63b88ccb 100644 --- a/mayan/apps/documents/tests/test_trashed_document_views.py +++ b/mayan/apps/documents/tests/test_trashed_document_views.py @@ -10,20 +10,6 @@ from .base import GenericDocumentViewTestCase class TrashedDocumentTestMixin(object): - def _request_document_restore_get_view(self): - return self.get( - viewname='documents:document_restore', kwargs={ - 'pk': self.test_document.pk - } - ) - - def _request_document_restore_post_view(self): - return self.post( - viewname='documents:document_restore', kwargs={ - 'pk': self.test_document.pk - } - ) - def _request_document_trash_get_view(self): return self.get( viewname='documents:document_trash', kwargs={ @@ -38,78 +24,41 @@ class TrashedDocumentTestMixin(object): } ) - def _request_document_delete_get_view(self): + def _request_trashed_document_restore_get_view(self): + return self.get( + viewname='documents:document_restore', kwargs={ + 'pk': self.test_document.pk + } + ) + + def _request_trashed_document_restore_post_view(self): + return self.post( + viewname='documents:document_restore', kwargs={ + 'pk': self.test_document.pk + } + ) + + def _request_trashed_document_delete_get_view(self): return self.get( viewname='documents:document_delete', kwargs={ 'pk': self.test_document.pk } ) - def _request_document_delete_post_view(self): + def _request_trashed_document_delete_post_view(self): return self.post( viewname='documents:document_delete', kwargs={ 'pk': self.test_document.pk } ) - def _request_document_list_deleted_view(self): + def _request_trashed_document_list_view(self): return self.get(viewname='documents:document_list_deleted') class TrashedDocumentTestCase( TrashedDocumentTestMixin, GenericDocumentViewTestCase ): - - def test_document_restore_get_view_no_permission(self): - self.test_document.delete() - self.assertEqual(Document.objects.count(), 0) - - document_count = Document.objects.count() - - response = self._request_document_restore_get_view() - self.assertEqual(response.status_code, 404) - - self.assertEqual(Document.objects.count(), document_count) - - def test_document_restore_get_view_with_access(self): - self.test_document.delete() - self.assertEqual(Document.objects.count(), 0) - - self.grant_access( - obj=self.test_document, permission=permission_document_restore - ) - - document_count = Document.objects.count() - - response = self._request_document_restore_get_view() - self.assertEqual(response.status_code, 200) - - self.assertEqual(Document.objects.count(), document_count) - - def test_document_restore_post_view_no_permission(self): - self.test_document.delete() - self.assertEqual(Document.objects.count(), 0) - - response = self._request_document_restore_post_view() - self.assertEqual(response.status_code, 404) - - self.assertEqual(DeletedDocument.objects.count(), 1) - self.assertEqual(Document.objects.count(), 0) - - def test_document_restore_post_view_with_access(self): - self.test_document.delete() - self.assertEqual(Document.objects.count(), 0) - - self.grant_access( - obj=self.test_document, permission=permission_document_restore - ) - - response = self._request_document_restore_post_view() - self.assertEqual(response.status_code, 302) - - self.assertEqual(DeletedDocument.objects.count(), 0) - self.assertEqual(Document.objects.count(), 1) - def test_document_trash_get_view_no_permissions(self): document_count = Document.objects.count() @@ -148,7 +97,57 @@ class TrashedDocumentTestCase( self.assertEqual(DeletedDocument.objects.count(), 1) self.assertEqual(Document.objects.count(), 0) - def test_document_delete_get_view_no_permissions(self): + def test_trashed_document_restore_get_view_no_permission(self): + self.test_document.delete() + self.assertEqual(Document.objects.count(), 0) + + document_count = Document.objects.count() + + response = self._request_document_restore_get_view() + self.assertEqual(response.status_code, 404) + + self.assertEqual(Document.objects.count(), document_count) + + def test_trashed_document_restore_get_view_with_access(self): + self.test_document.delete() + self.assertEqual(Document.objects.count(), 0) + + self.grant_access( + obj=self.test_document, permission=permission_document_restore + ) + + document_count = Document.objects.count() + + response = self._request_document_restore_get_view() + self.assertEqual(response.status_code, 200) + + self.assertEqual(Document.objects.count(), document_count) + + def test_trashed_document_restore_post_view_no_permission(self): + self.test_document.delete() + self.assertEqual(Document.objects.count(), 0) + + response = self._request_document_restore_post_view() + self.assertEqual(response.status_code, 404) + + self.assertEqual(DeletedDocument.objects.count(), 1) + self.assertEqual(Document.objects.count(), 0) + + def test_trashed_document_restore_post_view_with_access(self): + self.test_document.delete() + self.assertEqual(Document.objects.count(), 0) + + self.grant_access( + obj=self.test_document, permission=permission_document_restore + ) + + response = self._request_document_restore_post_view() + self.assertEqual(response.status_code, 302) + + self.assertEqual(DeletedDocument.objects.count(), 0) + self.assertEqual(Document.objects.count(), 1) + + def test_trashed_document_delete_get_view_no_permissions(self): self.test_document.delete() self.assertEqual(Document.objects.count(), 0) self.assertEqual(DeletedDocument.objects.count(), 1) @@ -162,7 +161,7 @@ class TrashedDocumentTestCase( DeletedDocument.objects.count(), trashed_document_count ) - def test_document_delete_get_view_with_access(self): + def test_trashed_document_delete_get_view_with_access(self): self.test_document.delete() self.assertEqual(Document.objects.count(), 0) self.assertEqual(DeletedDocument.objects.count(), 1) @@ -180,7 +179,7 @@ class TrashedDocumentTestCase( DeletedDocument.objects.count(), trashed_document_count ) - def test_document_delete_post_view_no_permissions(self): + def test_trashed_document_delete_post_view_no_permissions(self): self.test_document.delete() self.assertEqual(Document.objects.count(), 0) self.assertEqual(DeletedDocument.objects.count(), 1) @@ -191,7 +190,7 @@ class TrashedDocumentTestCase( self.assertEqual(Document.objects.count(), 0) self.assertEqual(DeletedDocument.objects.count(), 1) - def test_document_delete_post_view_with_access(self): + def test_trashed_document_delete_post_view_with_access(self): self.test_document.delete() self.assertEqual(Document.objects.count(), 0) self.assertEqual(DeletedDocument.objects.count(), 1) @@ -206,7 +205,7 @@ class TrashedDocumentTestCase( self.assertEqual(DeletedDocument.objects.count(), 0) self.assertEqual(Document.objects.count(), 0) - def test_deleted_document_list_view_no_permissions(self): + def test_trashed_document_list_view_no_permissions(self): self.test_document.delete() response = self._request_document_list_deleted_view() @@ -214,7 +213,7 @@ class TrashedDocumentTestCase( response=response, text=self.test_document.label, status_code=200 ) - def test_deleted_document_list_view_with_access(self): + def test_trashed_document_list_view_with_access(self): self.test_document.delete() self.grant_access(