From dc03a44513181b3f073a0102c95daa9c61766018 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 22 Oct 2019 13:13:53 -0400 Subject: [PATCH] Rename trashed document test mixin for clarity Signed-off-by: Roberto Rosario --- mayan/apps/documents/tests/mixins.py | 6 +++--- .../tests/test_trashed_document_views.py | 20 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mayan/apps/documents/tests/mixins.py b/mayan/apps/documents/tests/mixins.py index 8387431015..1116a49952 100644 --- a/mayan/apps/documents/tests/mixins.py +++ b/mayan/apps/documents/tests/mixins.py @@ -243,9 +243,6 @@ class DocumentViewTestMixin(object): data={'id_list': self.test_document.pk} ) - def _request_empty_trash_view(self): - return self.post(viewname='documents:trash_can_empty') - def _request_document_print_view(self): return self.get( viewname='documents:document_print', kwargs={ @@ -254,3 +251,6 @@ class DocumentViewTestMixin(object): 'page_group': PAGE_RANGE_ALL } ) + + def _request_empty_trash_view(self): + return self.post(viewname='documents:trash_can_empty') diff --git a/mayan/apps/documents/tests/test_trashed_document_views.py b/mayan/apps/documents/tests/test_trashed_document_views.py index 0e63b88ccb..9b2f4c7c5e 100644 --- a/mayan/apps/documents/tests/test_trashed_document_views.py +++ b/mayan/apps/documents/tests/test_trashed_document_views.py @@ -103,7 +103,7 @@ class TrashedDocumentTestCase( document_count = Document.objects.count() - response = self._request_document_restore_get_view() + response = self._request_trashed_document_restore_get_view() self.assertEqual(response.status_code, 404) self.assertEqual(Document.objects.count(), document_count) @@ -118,7 +118,7 @@ class TrashedDocumentTestCase( document_count = Document.objects.count() - response = self._request_document_restore_get_view() + response = self._request_trashed_document_restore_get_view() self.assertEqual(response.status_code, 200) self.assertEqual(Document.objects.count(), document_count) @@ -127,7 +127,7 @@ class TrashedDocumentTestCase( self.test_document.delete() self.assertEqual(Document.objects.count(), 0) - response = self._request_document_restore_post_view() + response = self._request_trashed_document_restore_post_view() self.assertEqual(response.status_code, 404) self.assertEqual(DeletedDocument.objects.count(), 1) @@ -141,7 +141,7 @@ class TrashedDocumentTestCase( obj=self.test_document, permission=permission_document_restore ) - response = self._request_document_restore_post_view() + response = self._request_trashed_document_restore_post_view() self.assertEqual(response.status_code, 302) self.assertEqual(DeletedDocument.objects.count(), 0) @@ -154,7 +154,7 @@ class TrashedDocumentTestCase( trashed_document_count = DeletedDocument.objects.count() - response = self._request_document_delete_get_view() + response = self._request_trashed_document_delete_get_view() self.assertEqual(response.status_code, 404) self.assertEqual( @@ -172,7 +172,7 @@ class TrashedDocumentTestCase( trashed_document_count = DeletedDocument.objects.count() - response = self._request_document_delete_get_view() + response = self._request_trashed_document_delete_get_view() self.assertEqual(response.status_code, 200) self.assertEqual( @@ -184,7 +184,7 @@ class TrashedDocumentTestCase( self.assertEqual(Document.objects.count(), 0) self.assertEqual(DeletedDocument.objects.count(), 1) - response = self._request_document_delete_post_view() + response = self._request_trashed_document_delete_post_view() self.assertEqual(response.status_code, 404) self.assertEqual(Document.objects.count(), 0) @@ -199,7 +199,7 @@ class TrashedDocumentTestCase( obj=self.test_document, permission=permission_document_delete ) - response = self._request_document_delete_post_view() + response = self._request_trashed_document_delete_post_view() self.assertEqual(response.status_code, 302) self.assertEqual(DeletedDocument.objects.count(), 0) @@ -208,7 +208,7 @@ class TrashedDocumentTestCase( def test_trashed_document_list_view_no_permissions(self): self.test_document.delete() - response = self._request_document_list_deleted_view() + response = self._request_trashed_document_list_view() self.assertNotContains( response=response, text=self.test_document.label, status_code=200 ) @@ -220,7 +220,7 @@ class TrashedDocumentTestCase( obj=self.test_document, permission=permission_document_view ) - response = self._request_document_list_deleted_view() + response = self._request_trashed_document_list_view() self.assertContains( response=response, text=self.test_document.label, status_code=200 )