From a9077cb47aa25ebf6aad60dbc2927dfece7e3acc Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 9 Oct 2019 19:40:08 -0400 Subject: [PATCH] Fix document search tests Signed-off-by: Roberto Rosario --- mayan/apps/documents/search.py | 20 ++++++++------------ mayan/apps/documents/tests/test_search.py | 12 +++++++++--- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mayan/apps/documents/search.py b/mayan/apps/documents/search.py index b42228a277..393ab3b4e6 100644 --- a/mayan/apps/documents/search.py +++ b/mayan/apps/documents/search.py @@ -38,7 +38,6 @@ document_search = SearchModel( model_name='Document', permission=permission_document_view, serializer_path='mayan.apps.documents.serializers.DocumentSerializer' ) -''' document_search.add_model_field( field='document_type__label', label=_('Document type') ) @@ -51,10 +50,10 @@ document_search.add_model_field( field='uuid', label=_('UUID'), transformation_function=transformation_format_uuid ) -#document_search.add_model_field( -# field='versions__checksum', label=_('Checksum') -#) -''' +document_search.add_model_field( + field='versions__checksum', label=_('Checksum') +) + document_page_search = SearchModel( app_label='documents', list_mode=LIST_MODE_CHOICE_ITEM, model_name='DocumentPage', permission=permission_document_view, @@ -68,7 +67,7 @@ document_version_page_search = SearchModel( #queryset=get_queryset_document_version_page_search_queryset, serializer_path='mayan.apps.documents.serializers.DocumentPageVersionSerializer' ) -''' + document_page_search.add_model_field( field='document__document_type__label', label=_('Document type') @@ -83,12 +82,10 @@ document_page_search.add_model_field( document_page_search.add_model_field( field='document__description', label=_('Description') ) -''' -#document_page_search.add_model_field( -# field='document__document_version__checksum', label=_('Checksum') -#) +document_page_search.add_model_field( + field='document__versions__checksum', label=_('Checksum') +) -''' document_version_page_search.add_model_field( field='document_version__document__document_type__label', label=_('Document type') @@ -106,4 +103,3 @@ document_version_page_search.add_model_field( document_version_page_search.add_model_field( field='document_version__checksum', label=_('Checksum') ) -''' diff --git a/mayan/apps/documents/tests/test_search.py b/mayan/apps/documents/tests/test_search.py index 07f85fdb00..1db040b174 100644 --- a/mayan/apps/documents/tests/test_search.py +++ b/mayan/apps/documents/tests/test_search.py @@ -8,17 +8,23 @@ from ..search import document_search, document_page_search from .mixins import DocumentTestMixin -class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase): +class DocumentSearchTestMixin(object): def _perform_document_page_search(self): return document_page_search.search( - query_string={'q': self.test_document.label}, user=self._test_case_user + query_string={'q': self.test_document.label}, + user=self._test_case_user ) def _perform_document_search(self): return document_search.search( - query_string={'q': self.test_document.label}, user=self._test_case_user + query_string={'q': self.test_document.label}, + user=self._test_case_user ) + +class DocumentSearchTestCase( + DocumentSearchTestMixin, DocumentTestMixin, BaseTestCase +): def test_document_page_search_no_access(self): queryset = self._perform_document_page_search() self.assertFalse(self.test_document.pages.first() in queryset)