From 2a501c537a0237894aa6f3bc711d8c934c566088 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 24 Oct 2019 15:45:09 -0400 Subject: [PATCH] Cleanup documents test mixins Signed-off-by: Roberto Rosario --- mayan/apps/documents/tests/mixins.py | 14 ++++++++++++++ .../tests/test_document_version_views.py | 16 +--------------- mayan/apps/documents/tests/test_search.py | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mayan/apps/documents/tests/mixins.py b/mayan/apps/documents/tests/mixins.py index 1116a49952..86ddba9bc6 100644 --- a/mayan/apps/documents/tests/mixins.py +++ b/mayan/apps/documents/tests/mixins.py @@ -152,6 +152,20 @@ class DocumentVersionTestMixin(object): ) +class DocumentVersionViewTestMixin(object): + def _request_document_version_list_view(self): + return self.get( + viewname='documents:document_version_list', + kwargs={'pk': self.test_document.pk} + ) + + def _request_document_version_revert_view(self, document_version): + return self.post( + viewname='documents:document_version_revert', + kwargs={'pk': document_version.pk} + ) + + class DocumentViewTestMixin(object): def _create_document_transformation(self): layer_saved_transformations.add_transformation_to( diff --git a/mayan/apps/documents/tests/test_document_version_views.py b/mayan/apps/documents/tests/test_document_version_views.py index 96eec871a2..754c123490 100644 --- a/mayan/apps/documents/tests/test_document_version_views.py +++ b/mayan/apps/documents/tests/test_document_version_views.py @@ -6,21 +6,7 @@ from ..permissions import ( from .base import GenericDocumentViewTestCase from .literals import TEST_VERSION_COMMENT -from .mixins import DocumentVersionTestMixin - - -class DocumentVersionViewTestMixin(object): - def _request_document_version_list_view(self): - return self.get( - viewname='documents:document_version_list', - kwargs={'pk': self.test_document.pk} - ) - - def _request_document_version_revert_view(self, document_version): - return self.post( - viewname='documents:document_version_revert', - kwargs={'pk': document_version.pk} - ) +from .mixins import DocumentVersionTestMixin, DocumentVersionViewTestMixin class DocumentVersionViewTestCase( diff --git a/mayan/apps/documents/tests/test_search.py b/mayan/apps/documents/tests/test_search.py index 47c2ea6b48..2f7e22b044 100644 --- a/mayan/apps/documents/tests/test_search.py +++ b/mayan/apps/documents/tests/test_search.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from mayan.apps.documents.permissions import permission_document_view -from mayan.apps.documents.search import document_search, document_page_search +from ..permissions import permission_document_view +from ..search import document_search, document_page_search from .base import GenericDocumentViewTestCase