diff --git a/mayan/apps/acls/tests/test_actions.py b/mayan/apps/acls/tests/test_actions.py index 62e7fddd41..eee6438b0c 100644 --- a/mayan/apps/acls/tests/test_actions.py +++ b/mayan/apps/acls/tests/test_actions.py @@ -15,35 +15,35 @@ class ACLActionTestCase(ActionTestCase): 'content_type': ContentType.objects.get_for_model( model=self.test_document ).pk, - 'object_id': self.document.pk, + 'object_id': self.test_document.pk, 'roles': [self._test_case_role.pk], 'permissions': [permission_document_view.pk], } ) action.execute(context={'entry_log': self.entry_log}) - self.assertEqual(self.document.acls.count(), 1) + self.assertEqual(self.test_document.acls.count(), 1) self.assertEqual( - list(self.document.acls.first().permissions.all()), + list(self.test_document.acls.first().permissions.all()), [permission_document_view.stored_permission] ) - self.assertEqual(self.document.acls.first().role, self._test_case_role) + self.assertEqual(self.test_document.acls.first().role, self._test_case_role) def test_revoke_access_action(self): self.grant_access( - obj=self.document, permission=permission_document_view + obj=self.test_document, permission=permission_document_view ) action = RevokeAccessAction( form_data={ 'content_type': ContentType.objects.get_for_model( - model=self.document + model=self.test_document ).pk, - 'object_id': self.document.pk, + 'object_id': self.test_document.pk, 'roles': [self._test_case_role.pk], 'permissions': [permission_document_view.pk], } ) action.execute(context={'entry_log': self.entry_log}) - self.assertEqual(self.document.acls.count(), 0) + self.assertEqual(self.test_document.acls.count(), 0) diff --git a/mayan/apps/cabinets/tests/test_wizard_steps.py b/mayan/apps/cabinets/tests/test_wizard_steps.py index f03298813a..5fa5e471c1 100644 --- a/mayan/apps/cabinets/tests/test_wizard_steps.py +++ b/mayan/apps/cabinets/tests/test_wizard_steps.py @@ -45,7 +45,7 @@ class CabinetDocumentUploadTestCase(CabinetTestMixin, GenericDocumentViewTestCas def test_upload_interactive_view_with_access(self): self._create_test_cabinet() self.grant_access( - obj=self.document_type, permission=permission_document_create + obj=self.test_document_type, permission=permission_document_create ) response = self._request_upload_interactive_document_create_view() @@ -63,7 +63,7 @@ class CabinetDocumentUploadTestCase(CabinetTestMixin, GenericDocumentViewTestCas self._create_test_cabinet() self.grant_access( - permission=permission_document_create, obj=self.document_type + permission=permission_document_create, obj=self.test_document_type ) diff --git a/mayan/apps/converter/tests/test_transformations.py b/mayan/apps/converter/tests/test_transformations.py index 40051d4544..c596abfa27 100644 --- a/mayan/apps/converter/tests/test_transformations.py +++ b/mayan/apps/converter/tests/test_transformations.py @@ -114,7 +114,7 @@ class TransformationTestCase(GenericDocumentTestCase): def test_crop_transformation_optional_arguments(self): self._silence_logger(name='mayan.apps.converter.managers') - document_page = self.document.pages.first() + document_page = self.test_document.pages.first() Transformation.objects.add_to_object( obj=document_page, transformation=TransformationCrop, @@ -126,7 +126,7 @@ class TransformationTestCase(GenericDocumentTestCase): def test_crop_transformation_invalid_arguments(self): self._silence_logger(name='mayan.apps.converter.managers') - document_page = self.document.pages.first() + document_page = self.test_document.pages.first() Transformation.objects.add_to_object( obj=document_page, transformation=TransformationCrop, @@ -138,7 +138,7 @@ class TransformationTestCase(GenericDocumentTestCase): def test_crop_transformation_non_valid_range_arguments(self): self._silence_logger(name='mayan.apps.converter.managers') - document_page = self.document.pages.first() + document_page = self.test_document.pages.first() Transformation.objects.add_to_object( obj=document_page, transformation=TransformationCrop, @@ -150,7 +150,7 @@ class TransformationTestCase(GenericDocumentTestCase): def test_crop_transformation_overlapping_ranges_arguments(self): self._silence_logger(name='mayan.apps.converter.managers') - document_page = self.document.pages.first() + document_page = self.test_document.pages.first() Transformation.objects.add_to_object( obj=document_page, transformation=TransformationCrop, @@ -165,7 +165,7 @@ class TransformationTestCase(GenericDocumentTestCase): self.assertTrue(document_page.generate_image().startswith('page')) def test_lineart_transformations(self): - document_page = self.document.pages.first() + document_page = self.test_document.pages.first() Transformation.objects.add_to_object( obj=document_page, transformation=TransformationLineArt, @@ -175,7 +175,7 @@ class TransformationTestCase(GenericDocumentTestCase): self.assertTrue(document_page.generate_image().startswith('page')) def test_rotate_transformations(self): - document_page = self.document.pages.first() + document_page = self.test_document.pages.first() Transformation.objects.add_to_object( obj=document_page, transformation=TransformationRotate90, diff --git a/mayan/apps/converter/tests/test_views.py b/mayan/apps/converter/tests/test_views.py index 948f2c6d62..faf33c8259 100644 --- a/mayan/apps/converter/tests/test_views.py +++ b/mayan/apps/converter/tests/test_views.py @@ -18,7 +18,7 @@ class TransformationViewsTestCase(GenericDocumentViewTestCase): return self.post( viewname='converter:transformation_create', kwargs={ 'app_label': 'documents', 'model': 'document', - 'object_id': self.document.pk + 'object_id': self.test_document.pk }, data={ 'name': TEST_TRANSFORMATION_NAME, 'arguments': TEST_TRANSFORMATION_ARGUMENT @@ -53,10 +53,10 @@ class TransformationViewsTestCase(GenericDocumentViewTestCase): ) def _create_test_transformation(self): - content_type = ContentType.objects.get_for_model(model=self.document) + content_type = ContentType.objects.get_for_model(model=self.test_document) self.test_transformation = Transformation.objects.create( - content_type=content_type, object_id=self.document.pk, + content_type=content_type, object_id=self.test_document.pk, name=TEST_TRANSFORMATION_NAME, arguments=TEST_TRANSFORMATION_ARGUMENT ) @@ -91,7 +91,7 @@ class TransformationViewsTestCase(GenericDocumentViewTestCase): return self.get( viewname='converter:transformation_list', kwargs={ 'app_label': 'documents', 'model': 'document', - 'object_id': self.document.pk + 'object_id': self.test_document.pk } ) @@ -101,10 +101,10 @@ class TransformationViewsTestCase(GenericDocumentViewTestCase): def test_transformation_list_view_with_permissions(self): self.grant_access( - obj=self.document, permission=permission_transformation_view + obj=self.test_document, permission=permission_transformation_view ) response = self._transformation_list_view() self.assertContains( - response=response, text=self.document.label, status_code=200 + response=response, text=self.test_document.label, status_code=200 ) diff --git a/mayan/apps/document_indexing/tests/test_api.py b/mayan/apps/document_indexing/tests/test_api.py index 26ea496125..ebb468b37d 100644 --- a/mayan/apps/document_indexing/tests/test_api.py +++ b/mayan/apps/document_indexing/tests/test_api.py @@ -22,7 +22,7 @@ class DocumentIndexingAPITestCase(IndexTestMixin, DocumentTestMixin, BaseAPITest return self.post( viewname='rest_api:index-list', data={ 'label': TEST_INDEX_LABEL, 'slug': TEST_INDEX_SLUG, - 'document_types': self.document_type.pk + 'document_types': self.test_document_type.pk } ) diff --git a/mayan/apps/document_indexing/tests/test_models.py b/mayan/apps/document_indexing/tests/test_models.py index dba5017433..d458e69625 100644 --- a/mayan/apps/document_indexing/tests/test_models.py +++ b/mayan/apps/document_indexing/tests/test_models.py @@ -33,19 +33,19 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): link_documents=True ) - self.document.description = TEST_DOCUMENT_DESCRIPTION - self.document.save() + self.test_document.description = TEST_DOCUMENT_DESCRIPTION + self.test_document.save() self.test_index.rebuild() self.assertEqual( - IndexInstanceNode.objects.last().value, self.document.description + IndexInstanceNode.objects.last().value, self.test_document.description ) - self.document.description = TEST_DOCUMENT_DESCRIPTION_EDITED - self.document.save() + self.test_document.description = TEST_DOCUMENT_DESCRIPTION_EDITED + self.test_document.save() self.assertEqual( - IndexInstanceNode.objects.last().value, self.document.description + IndexInstanceNode.objects.last().value, self.test_document.description ) def test_document_label_index(self): @@ -60,13 +60,13 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): self.test_index.rebuild() self.assertEqual( - IndexInstanceNode.objects.last().value, self.document.label + IndexInstanceNode.objects.last().value, self.test_document.label ) - self.document.label = TEST_DOCUMENT_LABEL_EDITED - self.document.save() + self.test_document.label = TEST_DOCUMENT_LABEL_EDITED + self.test_document.save() self.assertEqual( - IndexInstanceNode.objects.last().value, self.document.label + IndexInstanceNode.objects.last().value, self.test_document.label ) def test_date_based_index(self): @@ -86,21 +86,21 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): # Index the document created by default Index.objects.rebuild() - self.document.delete() + self.test_document.delete() # Uploading a new should not trigger an error - document = self.upload_document() + self.upload_document() self.assertEqual( list(IndexInstanceNode.objects.values_list('value', flat=True)), [ - '', force_text(document.date_added.year), - '{:02}'.format(document.date_added.month) + '', force_text(self.test_document.date_added.year), + '{:02}'.format(self.test_document.date_added.month) ] ) self.assertTrue( - document in IndexInstanceNode.objects.last().documents.all() + self.test_document in IndexInstanceNode.objects.last().documents.all() ) def test_dual_level_dual_document_index(self): @@ -110,7 +110,7 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): children of each of the first levels. GitLab issue #391 """ with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object: - self.document_2 = self.document_type.new_document( + self.test_document_2 = self.test_document_type.new_document( file_object=file_object ) @@ -135,8 +135,8 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): set(IndexInstanceNode.objects.values_list('value', flat=True)), set( [ - '', force_text(self.document_2.uuid), self.document_2.label, - force_text(self.document.uuid), self.document.label + '', force_text(self.test_document_2.uuid), self.test_document_2.label, + force_text(self.test_document.uuid), self.test_document.label ] ) ) @@ -146,7 +146,7 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): name=TEST_METADATA_TYPE_NAME, label=TEST_METADATA_TYPE_LABEL ) DocumentTypeMetadataType.objects.create( - document_type=self.document_type, metadata_type=metadata_type + document_type=self.test_document_type, metadata_type=metadata_type ) self._create_test_index() @@ -159,7 +159,7 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): ) # Add document metadata value to trigger index node instance creation - self.document.metadata.create( + self.test_document.metadata.create( metadata_type=metadata_type, value='0001' ) self.assertEqual( @@ -171,11 +171,11 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): # Check that document is in instance node instance_node = IndexInstanceNode.objects.get(value='0001') self.assertQuerysetEqual( - instance_node.documents.all(), [repr(self.document)] + instance_node.documents.all(), [repr(self.test_document)] ) # Change document metadata value to trigger index node instance update - document_metadata = self.document.metadata.get( + document_metadata = self.test_document.metadata.get( metadata_type=metadata_type ) document_metadata.value = '0002' @@ -189,11 +189,11 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): # Check that document is in new instance node instance_node = IndexInstanceNode.objects.get(value='0002') self.assertQuerysetEqual( - instance_node.documents.all(), [repr(self.document)] + instance_node.documents.all(), [repr(self.test_document)] ) # Check node instance is destoyed when no metadata is available - self.document.metadata.get(metadata_type=metadata_type).delete() + self.test_document.metadata.get(metadata_type=metadata_type).delete() self.assertEqual( list( IndexInstanceNode.objects.values_list('value', flat=True) @@ -202,7 +202,7 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): # Add document metadata value again to trigger index node instance # creation - self.document.metadata.create( + self.test_document.metadata.create( metadata_type=metadata_type, value='0003' ) self.assertEqual( @@ -212,7 +212,7 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): ) # Check node instance is destroyed when no documents are contained - self.document.delete() + self.test_document.delete() # Document is in trash, index structure should remain unchanged self.assertEqual( @@ -222,7 +222,7 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): ) # Document deleted, index structure should update - self.document.delete() + self.test_document.delete() self.assertEqual( list( IndexInstanceNode.objects.values_list('value', flat=True) @@ -253,11 +253,11 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): # Add metadata type and connect to document type metadata_type = MetadataType.objects.create(name='test', label='test') DocumentTypeMetadataType.objects.create( - document_type=self.document_type, metadata_type=metadata_type + document_type=self.test_document_type, metadata_type=metadata_type ) # Add document metadata value - self.document.metadata.create( + self.test_document.metadata.create( metadata_type=metadata_type, value='0001' ) @@ -284,5 +284,5 @@ class IndexTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): # Check that document is in instance node instance_node = IndexInstanceNode.objects.get(value='0001') self.assertQuerysetEqual( - instance_node.documents.all(), [repr(self.document)] + instance_node.documents.all(), [repr(self.test_document)] ) diff --git a/mayan/apps/document_parsing/tests/test_indexing.py b/mayan/apps/document_parsing/tests/test_indexing.py index dc87fabe67..4936cf4352 100644 --- a/mayan/apps/document_parsing/tests/test_indexing.py +++ b/mayan/apps/document_parsing/tests/test_indexing.py @@ -23,7 +23,7 @@ class ParsingIndexingTestCase(DocumentTestMixin, BaseTestCase): link_documents=True ) - self.test_document = self.upload_document() + self.upload_document() self.test_document.submit_for_parsing() self.assertTrue( diff --git a/mayan/apps/document_parsing/tests/test_models.py b/mayan/apps/document_parsing/tests/test_models.py index caeefe39e0..ee5ccb55a3 100644 --- a/mayan/apps/document_parsing/tests/test_models.py +++ b/mayan/apps/document_parsing/tests/test_models.py @@ -13,14 +13,14 @@ class DocumentAutoParsingTestCase(GenericDocumentTestCase): def test_disable_auto_parsing(self): self._create_document_type() - self.test_document = self.upload_document() + self.upload_document() with self.assertRaises(StopIteration): next(self.test_document.latest_version.content()) @override_settings(DOCUMENT_PARSING_AUTO_PARSING=True) def test_enabled_auto_parsing(self): self._create_document_type() - self.test_document = self.upload_document() + self.upload_document() self.assertTrue( TEST_DOCUMENT_CONTENT in next(self.test_document.content()) ) diff --git a/mayan/apps/document_states/tests/test_actions.py b/mayan/apps/document_states/tests/test_actions.py index 5d944d1a27..526a9a4f69 100644 --- a/mayan/apps/document_states/tests/test_actions.py +++ b/mayan/apps/document_states/tests/test_actions.py @@ -8,7 +8,7 @@ class ActionTestCase(GenericDocumentTestCase): super(ActionTestCase, self).setUp() class MockWorkflowInstance(object): - document = self.document + document = self.test_document class MockEntryLog(object): workflow_instance = MockWorkflowInstance() diff --git a/mayan/apps/document_states/tests/test_views.py b/mayan/apps/document_states/tests/test_views.py index 49c5ad2018..b523f4fa12 100644 --- a/mayan/apps/document_states/tests/test_views.py +++ b/mayan/apps/document_states/tests/test_views.py @@ -407,8 +407,8 @@ class WorkflowTransitionViewTestCase( self.test_workflow.document_types.add(self.test_document_type) self._create_test_workflow_states() self._create_test_workflow_transitions() - self.test_document_2 = self.upload_document() - self.test_workflow_instance = self.test_document_2.workflows.first() + self.upload_document() + self.test_workflow_instance = self.test_document.workflows.first() response = self._request_test_workflow_transition() self.assertEqual(response.status_code, 200) @@ -428,8 +428,8 @@ class WorkflowTransitionViewTestCase( self.test_workflow.document_types.add(self.test_document_type) self._create_test_workflow_states() self._create_test_workflow_transitions() - self.test_document_2 = self.upload_document() - self.test_workflow_instance = self.test_document_2.workflows.first() + self.upload_document() + self.test_workflow_instance = self.test_document.workflows.first() self.grant_permission(permission=permission_workflow_transition) @@ -450,8 +450,8 @@ class WorkflowTransitionViewTestCase( self.test_workflow.document_types.add(self.test_document_type) self._create_test_workflow_states() self._create_test_workflow_transitions() - self.test_document_2 = self.upload_document() - self.test_workflow_instance = self.test_document_2.workflows.first() + self.upload_document() + self.test_workflow_instance = self.test_document.workflows.first() self.grant_permission(permission=permission_workflow_transition) diff --git a/mayan/apps/documents/tests/mixins.py b/mayan/apps/documents/tests/mixins.py index ec1d706b92..c5e688ece0 100644 --- a/mayan/apps/documents/tests/mixins.py +++ b/mayan/apps/documents/tests/mixins.py @@ -22,10 +22,10 @@ class DocumentTestMixin(object): test_document_path = None def _create_document_type(self): - self.document_type = DocumentType.objects.create( + self.test_document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE_LABEL ) - self.test_document_type = self.document_type + self.test_document_type = self.test_document_type def upload_document(self, label=None): self._calculate_test_document_path() @@ -34,13 +34,12 @@ class DocumentTestMixin(object): label = self.test_document_filename with open(self.test_document_path, mode='rb') as file_object: - document = self.document_type.new_document( + document = self.test_document_type.new_document( file_object=file_object, label=label ) self.test_document = document self.test_documents.append(document) - return document def _calculate_test_document_path(self): if not self.test_document_path: @@ -57,7 +56,7 @@ class DocumentTestMixin(object): self._create_document_type() if self.auto_upload_document: - self.document = self.upload_document() + self.upload_document() def tearDown(self): for document_type in DocumentType.objects.all(): diff --git a/mayan/apps/documents/tests/test_api.py b/mayan/apps/documents/tests/test_api.py index e5ab4f08ad..1ad549cc90 100644 --- a/mayan/apps/documents/tests/test_api.py +++ b/mayan/apps/documents/tests/test_api.py @@ -77,7 +77,8 @@ class DocumentTypeAPITestCase(DocumentTestMixin, BaseAPITestCase): label=TEST_DOCUMENT_TYPE_LABEL ) self.grant_access( - permission=permission_document_type_edit, obj=self.test_document_type + obj=self.test_document_type, + permission=permission_document_type_edit ) response = self._request_document_type_put() @@ -106,7 +107,8 @@ class DocumentTypeAPITestCase(DocumentTestMixin, BaseAPITestCase): label=TEST_DOCUMENT_TYPE_LABEL ) self.grant_access( - permission=permission_document_type_edit, obj=self.test_document_type + obj=self.test_document_type, + permission=permission_document_type_edit ) response = self._request_document_type_put() @@ -138,7 +140,8 @@ class DocumentTypeAPITestCase(DocumentTestMixin, BaseAPITestCase): label=TEST_DOCUMENT_TYPE_LABEL ) self.grant_access( - permission=permission_document_type_delete, obj=self.test_document_type + obj=self.test_document_type, + permission=permission_document_type_delete ) response = self._request_document_type_delete() @@ -165,7 +168,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_document_upload_with_access(self): self.grant_access( - permission=permission_document_create, obj=self.test_document_type + obj=self.test_document_type, permission=permission_document_create ) response = self._request_document_upload() @@ -223,7 +226,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_document_new_version_upload_with_access(self): self.upload_document() self.grant_access( - permission=permission_document_new_version, obj=self.test_document + obj=self.test_document, permission=permission_document_new_version ) response = self._request_document_new_version_upload() @@ -298,7 +301,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): self.upload_document() self._create_new_version() self.grant_access( - permission=permission_document_version_view, obj=self.test_document + obj=self.test_document, permission=permission_document_version_view ) response = self._request_document_version_list() self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -324,7 +327,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_document_download_with_access(self): self.upload_document() self.grant_access( - permission=permission_document_download, obj=self.test_document + obj=self.test_document, permission=permission_document_download ) response = self._request_document_download() @@ -411,7 +414,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_document_version_edit_via_patch_with_access(self): self.upload_document() self.grant_access( - permission=permission_document_edit, obj=self.test_document + obj=self.test_document, permission=permission_document_edit ) response = self._request_document_version_edit_via_patch() self.assertEqual(response.status_code, status.HTTP_200_OK) @@ -439,7 +442,7 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_document_version_edit_via_put_with_access(self): self.upload_document() self.grant_access( - permission=permission_document_edit, obj=self.test_document + obj=self.test_document, permission=permission_document_edit ) response = self._request_document_version_edit_via_put() @@ -497,7 +500,8 @@ class DocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_document_description_edit_via_put_with_access(self): self.upload_document() self.grant_access( - permission=permission_document_properties_edit, obj=self.test_document + obj=self.test_document, + permission=permission_document_properties_edit ) response = self._request_document_description_edit_via_put() @@ -526,7 +530,7 @@ class DocumentPageAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_document_page_image_view_with_access(self): self.grant_access( - permission=permission_document_view, obj=self.test_document + obj=self.test_document, permission=permission_document_view ) response = self._request_document_page_image() @@ -554,7 +558,7 @@ class TrashedDocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): self.upload_document() self.grant_access( - permission=permission_document_trash, obj=self.test_document + obj=self.test_document, permission=permission_document_trash ) response = self._request_document_move_to_trash() @@ -613,11 +617,15 @@ class TrashedDocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): def test_trashed_document_detail_view_with_access(self): self.upload_document() self.test_document.delete() - self.grant_access(permission=permission_document_view, obj=self.test_document) + self.grant_access( + obj=self.test_document, permission=permission_document_view + ) response = self._request_trashed_document_detail_view() self.assertEqual(response.status_code, status.HTTP_200_OK) - self.assertEqual(response.data['uuid'], force_text(self.test_document.uuid)) + self.assertEqual( + response.data['uuid'], force_text(self.test_document.uuid) + ) def _request_trashed_document_list_view(self): return self.get( @@ -636,7 +644,7 @@ class TrashedDocumentAPITestCase(DocumentTestMixin, BaseAPITestCase): self.upload_document() self.test_document.delete() self.grant_access( - permission=permission_document_view, obj=self.test_document + obj=self.test_document, permission=permission_document_view ) response = self._request_trashed_document_list_view() diff --git a/mayan/apps/documents/tests/test_document_type_views.py b/mayan/apps/documents/tests/test_document_type_views.py index 3d4fc70463..f4c3ce4ff1 100644 --- a/mayan/apps/documents/tests/test_document_type_views.py +++ b/mayan/apps/documents/tests/test_document_type_views.py @@ -62,7 +62,8 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase): def test_document_type_delete_view_with_access(self): self.grant_access( - obj=self.test_document_type, permission=permission_document_type_delete + obj=self.test_document_type, + permission=permission_document_type_delete ) response = self._request_document_type_delete() @@ -106,7 +107,9 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase): ) -class DocumentTypeQuickLabelViewsTestCase(DocumentTypeQuickLabelTestMixin, GenericDocumentViewTestCase): +class DocumentTypeQuickLabelViewsTestCase( + DocumentTypeQuickLabelTestMixin, GenericDocumentViewTestCase +): def _request_quick_label_create(self): return self.post( viewname='documents:document_type_filename_create', @@ -129,7 +132,8 @@ class DocumentTypeQuickLabelViewsTestCase(DocumentTypeQuickLabelTestMixin, Gener def test_document_type_quick_label_create_with_access(self): self.grant_access( - obj=self.test_document_type, permission=permission_document_type_edit + obj=self.test_document_type, + permission=permission_document_type_edit ) response = self._request_quick_label_create() @@ -154,7 +158,8 @@ class DocumentTypeQuickLabelViewsTestCase(DocumentTypeQuickLabelTestMixin, Gener def test_document_type_quick_label_delete_with_access(self): self.grant_access( - obj=self.test_document_type, permission=permission_document_type_edit + obj=self.test_document_type, + permission=permission_document_type_edit ) self._create_test_quick_label() diff --git a/mayan/apps/documents/tests/test_document_version_views.py b/mayan/apps/documents/tests/test_document_version_views.py index db2d60bace..4f712a638b 100644 --- a/mayan/apps/documents/tests/test_document_version_views.py +++ b/mayan/apps/documents/tests/test_document_version_views.py @@ -13,7 +13,7 @@ class DocumentVersionTestCase(DocumentVersionTestMixin, GenericDocumentViewTestC def _request_document_version_list_view(self): return self.get( viewname='documents:document_version_list', - kwargs={'pk': self.document.pk} + kwargs={'pk': self.test_document.pk} ) def test_document_version_list_no_permission(self): @@ -25,7 +25,7 @@ class DocumentVersionTestCase(DocumentVersionTestMixin, GenericDocumentViewTestC def test_document_version_list_with_access(self): self._upload_new_version() self.grant_access( - obj=self.document, permission=permission_document_version_view + obj=self.test_document, permission=permission_document_version_view ) response = self._request_document_version_list_view() @@ -40,7 +40,7 @@ class DocumentVersionTestCase(DocumentVersionTestMixin, GenericDocumentViewTestC ) def test_document_version_revert_no_permission(self): - first_version = self.document.latest_version + first_version = self.test_document.latest_version self._upload_new_version() response = self._request_document_version_revert_view( @@ -48,14 +48,14 @@ class DocumentVersionTestCase(DocumentVersionTestMixin, GenericDocumentViewTestC ) self.assertEqual(response.status_code, 404) - self.assertEqual(self.document.versions.count(), 2) + self.assertEqual(self.test_document.versions.count(), 2) def test_document_version_revert_with_access(self): - first_version = self.document.latest_version + first_version = self.test_document.latest_version self._upload_new_version() self.grant_access( - obj=self.document, permission=permission_document_version_revert + obj=self.test_document, permission=permission_document_version_revert ) response = self._request_document_version_revert_view( @@ -63,4 +63,4 @@ class DocumentVersionTestCase(DocumentVersionTestMixin, GenericDocumentViewTestC ) self.assertEqual(response.status_code, 302) - self.assertEqual(self.document.versions.count(), 1) + self.assertEqual(self.test_document.versions.count(), 1) diff --git a/mayan/apps/documents/tests/test_duplicated_document_views.py b/mayan/apps/documents/tests/test_duplicated_document_views.py index 6c3cfc1a56..a1bf680c18 100644 --- a/mayan/apps/documents/tests/test_duplicated_document_views.py +++ b/mayan/apps/documents/tests/test_duplicated_document_views.py @@ -7,7 +7,7 @@ from .base import GenericDocumentViewTestCase class DuplicatedDocumentsViewsTestCase(GenericDocumentViewTestCase): def _upload_duplicate_document(self): - self.test_duplicated_document = self.upload_document() + self.upload_document() def _request_duplicated_document_list_view(self): return self.get(viewname='documents:duplicated_document_list') @@ -15,7 +15,7 @@ class DuplicatedDocumentsViewsTestCase(GenericDocumentViewTestCase): def _request_document_duplicates_list_view(self): return self.get( viewname='documents:document_duplicates_list', - kwargs={'pk': self.test_document.pk} + kwargs={'pk': self.test_documents[0].pk} ) def test_duplicated_document_list_no_permissions(self): @@ -23,22 +23,25 @@ class DuplicatedDocumentsViewsTestCase(GenericDocumentViewTestCase): response = self._request_duplicated_document_list_view() self.assertNotContains( - response=response, text=self.test_document.label, status_code=200 + response=response, text=self.test_documents[0].label, + status_code=200 ) def test_duplicated_document_list_with_access(self): self._upload_duplicate_document() self.grant_access( - obj=self.test_document, permission=permission_document_view + obj=self.test_documents[0], + permission=permission_document_view ) self.grant_access( - obj=self.test_duplicated_document, + obj=self.test_documents[1], permission=permission_document_view ) response = self._request_duplicated_document_list_view() self.assertContains( - response=response, text=self.test_document.label, status_code=200 + response=response, text=self.test_documents[0].label, + status_code=200 ) def test_document_duplicates_list_no_permissions(self): @@ -50,14 +53,16 @@ class DuplicatedDocumentsViewsTestCase(GenericDocumentViewTestCase): def test_document_duplicates_list_with_access(self): self._upload_duplicate_document() self.grant_access( - obj=self.test_document, permission=permission_document_view + obj=self.test_documents[0], + permission=permission_document_view ) self.grant_access( - obj=self.test_duplicated_document, + obj=self.test_documents[1], permission=permission_document_view ) response = self._request_document_duplicates_list_view() self.assertContains( - response=response, text=self.test_document.label, status_code=200 + response=response, text=self.test_documents[0].label, + status_code=200 ) diff --git a/mayan/apps/documents/tests/test_links.py b/mayan/apps/documents/tests/test_links.py index 83c34b85fe..c5947aca14 100644 --- a/mayan/apps/documents/tests/test_links.py +++ b/mayan/apps/documents/tests/test_links.py @@ -21,11 +21,11 @@ from .literals import TEST_SMALL_DOCUMENT_PATH class DocumentsLinksTestCase(GenericDocumentViewTestCase): def test_document_version_revert_link_no_permission(self): with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object: - self.document.new_version(file_object=file_object) + self.test_document.new_version(file_object=file_object) - self.assertTrue(self.document.versions.count(), 2) + self.assertTrue(self.test_document.versions.count(), 2) - self.add_test_view(test_object=self.document.versions.first()) + self.add_test_view(test_object=self.test_document.versions.first()) context = self.get_test_view() resolved_link = link_document_version_revert.resolve(context=context) @@ -37,16 +37,16 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): time.sleep(1.01) with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object: - self.document.new_version(file_object=file_object) + self.test_document.new_version(file_object=file_object) - self.assertTrue(self.document.versions.count(), 2) + self.assertTrue(self.test_document.versions.count(), 2) self.grant_access( obj=self.test_document, permission=permission_document_version_revert ) - self.add_test_view(test_object=self.document.versions.first()) + self.add_test_view(test_object=self.test_document.versions.first()) context = self.get_test_view() resolved_link = link_document_version_revert.resolve(context=context) @@ -55,12 +55,12 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): resolved_link.url, reverse( viewname=link_document_version_revert.view, - args=(self.document.versions.first().pk,) + args=(self.test_document.versions.first().pk,) ) ) def test_document_version_download_link_no_permission(self): - self.add_test_view(test_object=self.document.latest_version) + self.add_test_view(test_object=self.test_document.latest_version) context = self.get_test_view() resolved_link = link_document_version_download.resolve(context=context) @@ -72,7 +72,7 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): permission=permission_document_download ) - self.add_test_view(test_object=self.document.latest_version) + self.add_test_view(test_object=self.test_document.latest_version) context = self.get_test_view() resolved_link = link_document_version_download.resolve(context=context) @@ -81,7 +81,7 @@ class DocumentsLinksTestCase(GenericDocumentViewTestCase): resolved_link.url, reverse( viewname=link_document_version_download.view, - args=(self.document.latest_version.pk,) + args=(self.test_document.latest_version.pk,) ) ) @@ -90,9 +90,9 @@ class DeletedDocumentsLinksTestCase(GenericDocumentViewTestCase): def setUp(self): super(DeletedDocumentsLinksTestCase, self).setUp() self.login_user() - self.document.delete() + self.test_document.delete() self.test_deleted_document = DeletedDocument.objects.get( - pk=self.document.pk + pk=self.test_document.pk ) self.add_test_view(test_object=self.test_deleted_document) self.context = self.get_test_view() @@ -103,7 +103,7 @@ class DeletedDocumentsLinksTestCase(GenericDocumentViewTestCase): def test_deleted_document_restore_link_with_permission(self): self.grant_access( - obj=self.document, permission=permission_document_restore + obj=self.test_document, permission=permission_document_restore ) resolved_link = link_document_restore.resolve(context=self.context) self.assertNotEqual(resolved_link, None) diff --git a/mayan/apps/documents/tests/test_models.py b/mayan/apps/documents/tests/test_models.py index c46d291433..51f81cdf03 100644 --- a/mayan/apps/documents/tests/test_models.py +++ b/mayan/apps/documents/tests/test_models.py @@ -23,46 +23,46 @@ from .mixins import DocumentTestMixin class DocumentTestCase(DocumentTestMixin, BaseTestCase): def test_natural_keys(self): - self.document.pages.first().generate_image() + self.test_document.pages.first().generate_image() self._test_database_conversion('documents') def test_document_creation(self): - self.assertEqual(self.document_type.label, TEST_DOCUMENT_TYPE_LABEL) + self.assertEqual(self.test_document_type.label, TEST_DOCUMENT_TYPE_LABEL) - self.assertEqual(self.document.exists(), True) - self.assertEqual(self.document.size, TEST_SMALL_DOCUMENT_SIZE) + self.assertEqual(self.test_document.exists(), True) + self.assertEqual(self.test_document.size, TEST_SMALL_DOCUMENT_SIZE) self.assertEqual( - self.document.file_mimetype, TEST_SMALL_DOCUMENT_MIMETYPE + self.test_document.file_mimetype, TEST_SMALL_DOCUMENT_MIMETYPE ) - self.assertEqual(self.document.file_mime_encoding, 'binary') - self.assertEqual(self.document.label, TEST_SMALL_DOCUMENT_FILENAME) + self.assertEqual(self.test_document.file_mime_encoding, 'binary') + self.assertEqual(self.test_document.label, TEST_SMALL_DOCUMENT_FILENAME) self.assertEqual( - self.document.checksum, TEST_SMALL_DOCUMENT_CHECKSUM + self.test_document.checksum, TEST_SMALL_DOCUMENT_CHECKSUM ) - self.assertEqual(self.document.page_count, 1) + self.assertEqual(self.test_document.page_count, 1) def test_version_creation(self): with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object: - self.document.new_version(file_object=file_object) + self.test_document.new_version(file_object=file_object) with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object: - self.document.new_version( + self.test_document.new_version( file_object=file_object, comment='test comment 1' ) - self.assertEqual(self.document.versions.count(), 3) + self.assertEqual(self.test_document.versions.count(), 3) def test_restoring_documents(self): self.assertEqual(Document.objects.count(), 1) # Trash the document - self.document.delete() + self.test_document.delete() self.assertEqual(DeletedDocument.objects.count(), 1) self.assertEqual(Document.objects.count(), 0) # Restore the document - self.document.restore() + self.test_document.restore() self.assertEqual(DeletedDocument.objects.count(), 0) self.assertEqual(Document.objects.count(), 1) @@ -70,12 +70,12 @@ class DocumentTestCase(DocumentTestMixin, BaseTestCase): self.assertEqual(Document.objects.count(), 1) # Trash the document - self.document.delete() + self.test_document.delete() self.assertEqual(DeletedDocument.objects.count(), 1) self.assertEqual(Document.objects.count(), 0) # Delete the document - self.document.delete() + self.test_document.delete() self.assertEqual(DeletedDocument.objects.count(), 0) self.assertEqual(Document.objects.count(), 0) @@ -84,10 +84,10 @@ class DocumentTestCase(DocumentTestMixin, BaseTestCase): Test document type trashing policies. Documents are moved to the trash, x amount of time after being uploaded """ - self.document_type.trash_time_period = 1 + self.test_document_type.trash_time_period = 1 # 'seconds' is not a choice via the model, used here for convenience - self.document_type.trash_time_unit = 'seconds' - self.document_type.save() + self.test_document_type.trash_time_unit = 'seconds' + self.test_document_type.save() # Needed by MySQL as milliseconds value is not store in timestamp # field @@ -106,15 +106,15 @@ class DocumentTestCase(DocumentTestMixin, BaseTestCase): Test document type deletion policies. Documents are deleted from the trash, x amount of time after being trashed """ - self.document_type.delete_time_period = 1 + self.test_document_type.delete_time_period = 1 # 'seconds' is not a choice via the model, used here for convenience - self.document_type.delete_time_unit = 'seconds' - self.document_type.save() + self.test_document_type.delete_time_unit = 'seconds' + self.test_document_type.save() self.assertEqual(Document.objects.count(), 1) self.assertEqual(DeletedDocument.objects.count(), 0) - self.document.delete() + self.test_document.delete() self.assertEqual(Document.objects.count(), 0) self.assertEqual(DeletedDocument.objects.count(), 1) @@ -131,17 +131,17 @@ class DocumentTestCase(DocumentTestMixin, BaseTestCase): class PDFCompatibilityTestCase(BaseTestCase): def test_indirect_rotate(self): - self.document_type = DocumentType.objects.create( + self.test_document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE_LABEL ) with open(TEST_PDF_INDIRECT_ROTATE_PATH, mode='rb') as file_object: - self.document = self.document_type.new_document( + self.test_document = self.test_document_type.new_document( file_object=file_object ) self.assertQuerysetEqual( - qs=Document.objects.all(), values=(repr(self.document),) + qs=Document.objects.all(), values=(repr(self.test_document),) ) @@ -149,106 +149,106 @@ class OfficeDocumentTestCase(BaseTestCase): def setUp(self): super(OfficeDocumentTestCase, self).setUp() - self.document_type = DocumentType.objects.create( + self.test_document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE_LABEL ) with open(TEST_OFFICE_DOCUMENT_PATH, mode='rb') as file_object: - self.document = self.document_type.new_document( + self.test_document = self.test_document_type.new_document( file_object=file_object ) def tearDown(self): - self.document_type.delete() + self.test_document_type.delete() super(OfficeDocumentTestCase, self).tearDown() def test_document_creation(self): - self.assertEqual(self.document.file_mimetype, 'application/msword') + self.assertEqual(self.test_document.file_mimetype, 'application/msword') self.assertEqual( - self.document.file_mime_encoding, 'binary' + self.test_document.file_mime_encoding, 'binary' ) self.assertEqual( - self.document.checksum, + self.test_document.checksum, '03a7e9071d2c6ae05a6588acd7dff1d890fac2772cf61abd470c9ffa6ef71f03' ) - self.assertEqual(self.document.page_count, 2) + self.assertEqual(self.test_document.page_count, 2) class MultiPageTiffTestCase(BaseTestCase): def setUp(self): super(MultiPageTiffTestCase, self).setUp() - self.document_type = DocumentType.objects.create( + self.test_document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE_LABEL ) with open(TEST_MULTI_PAGE_TIFF_PATH, mode='rb') as file_object: - self.document = self.document_type.new_document( + self.test_document = self.test_document_type.new_document( file_object=file_object ) def tearDown(self): - self.document_type.delete() + self.test_document_type.delete() super(MultiPageTiffTestCase, self).tearDown() def test_document_creation(self): - self.assertEqual(self.document.file_mimetype, 'image/tiff') - self.assertEqual(self.document.file_mime_encoding, 'binary') + self.assertEqual(self.test_document.file_mimetype, 'image/tiff') + self.assertEqual(self.test_document.file_mime_encoding, 'binary') self.assertEqual( - self.document.checksum, + self.test_document.checksum, '40adaa9d658b65c70a7f002dfe084a8354bb77c0dfbf1993e31fb024a285fb1d' ) - self.assertEqual(self.document.page_count, 2) + self.assertEqual(self.test_document.page_count, 2) class DocumentVersionTestCase(GenericDocumentTestCase): def test_add_new_version(self): - self.assertEqual(self.document.versions.count(), 1) + self.assertEqual(self.test_document.versions.count(), 1) with open(TEST_DOCUMENT_PATH, mode='rb') as file_object: - self.document.new_version( + self.test_document.new_version( file_object=file_object ) - self.assertEqual(self.document.versions.count(), 2) + self.assertEqual(self.test_document.versions.count(), 2) self.assertEqual( - self.document.checksum, + self.test_document.checksum, 'c637ffab6b8bb026ed3784afdb07663fddc60099853fae2be93890852a69ecf3' ) def test_revert_version(self): - self.assertEqual(self.document.versions.count(), 1) + self.assertEqual(self.test_document.versions.count(), 1) # Needed by MySQL as milliseconds value is not store in timestamp # field time.sleep(1.01) with open(TEST_DOCUMENT_PATH, mode='rb') as file_object: - self.document.new_version( + self.test_document.new_version( file_object=file_object ) - self.assertEqual(self.document.versions.count(), 2) + self.assertEqual(self.test_document.versions.count(), 2) - self.document.versions.first().revert() + self.test_document.versions.first().revert() - self.assertEqual(self.document.versions.count(), 1) + self.assertEqual(self.test_document.versions.count(), 1) class DocumentManagerTestCase(BaseTestCase): def setUp(self): super(DocumentManagerTestCase, self).setUp() - self.document_type = DocumentType.objects.create( + self.test_document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE_LABEL ) def tearDown(self): - self.document_type.delete() + self.test_document_type.delete() super(DocumentManagerTestCase, self).tearDown() def test_document_stubs_deletion(self): document_stub = Document.objects.create( - document_type=self.document_type + document_type=self.test_document_type ) Document.passthrough.delete_stubs() @@ -267,19 +267,31 @@ class DocumentManagerTestCase(BaseTestCase): class DuplicatedDocumentsTestCase(GenericDocumentTestCase): def test_duplicates_after_delete(self): - document_2 = self.upload_document() - document_2.delete() - document_2.delete() + self.upload_document() + self.test_documents[1].delete() + self.test_documents[1].delete() - self.assertEqual(DuplicatedDocument.objects.filter(document=self.document).count(), 0) + self.assertEqual( + DuplicatedDocument.objects.filter( + document=self.test_documents[0] + ).count(), 0 + ) def test_duplicates_after_trash(self): - document_2 = self.upload_document() - document_2.delete() + self.upload_document() + self.test_documents[1].delete() - self.assertFalse(document_2 in DuplicatedDocument.objects.get(document=self.document).documents.all()) + self.assertFalse( + self.test_documents[1] in DuplicatedDocument.objects.get( + document=self.test_documents[0] + ).documents.all() + ) def test_duplicate_scan(self): - document_2 = self.upload_document() + self.upload_document() - self.assertTrue(document_2 in DuplicatedDocument.objects.get(document=self.document).documents.all()) + self.assertTrue( + self.test_documents[1] in DuplicatedDocument.objects.get( + document=self.test_documents[0] + ).documents.all() + ) diff --git a/mayan/apps/documents/tests/test_search.py b/mayan/apps/documents/tests/test_search.py index fa594063ba..76cc6b56be 100644 --- a/mayan/apps/documents/tests/test_search.py +++ b/mayan/apps/documents/tests/test_search.py @@ -9,32 +9,32 @@ from mayan.apps.documents.tests import DocumentTestMixin class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase): def _perform_document_page_search(self): return document_page_search.search( - query_string={'q': self.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.document.label}, user=self._test_case_user + query_string={'q': self.test_document.label}, user=self._test_case_user ) def test_document_page_search_no_access(self): queryset = self._perform_document_page_search() - self.assertFalse(self.document.pages.first() in queryset) + self.assertFalse(self.test_document.pages.first() in queryset) def test_document_page_search_with_access(self): self.grant_access( obj=self.test_document, permission=permission_document_view ) queryset = self._perform_document_page_search() - self.assertTrue(self.document.pages.first() in queryset) + self.assertTrue(self.test_document.pages.first() in queryset) def test_document_search_no_access(self): queryset = self._perform_document_search() - self.assertFalse(self.document in queryset) + self.assertFalse(self.test_document in queryset) def test_document_search_with_access(self): self.grant_access( obj=self.test_document, permission=permission_document_view ) queryset = self._perform_document_search() - self.assertTrue(self.document in queryset) + self.assertTrue(self.test_document in queryset) diff --git a/mayan/apps/documents/tests/test_widgets.py b/mayan/apps/documents/tests/test_widgets.py index ee2433a795..1e47d32823 100644 --- a/mayan/apps/documents/tests/test_widgets.py +++ b/mayan/apps/documents/tests/test_widgets.py @@ -9,6 +9,6 @@ class DocumentPageWidgetTestCase(GenericDocumentTestCase): def test_document_list_view_document_with_no_pages(self): document_thumbnail_widget = DocumentPageThumbnailWidget() self.test_document.pages.all().delete() - result = document_thumbnail_widget.render(instance=self.document) + result = document_thumbnail_widget.render(instance=self.test_document) - self.assertTrue(self.document.get_absolute_url() in result) + self.assertTrue(self.test_document.get_absolute_url() in result) diff --git a/mayan/apps/dynamic_search/tests/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py index 0628548a24..e3bfaf7d29 100644 --- a/mayan/apps/dynamic_search/tests/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -60,36 +60,36 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase): def test_simple_or_search(self): self.upload_document(label='first_doc') self.grant_access( - obj=self.test_document, permission=permission_document_view + obj=self.test_documents[0], permission=permission_document_view ) - self.test_document_2 = self.upload_document(label='second_doc') + self.upload_document(label='second_doc') self.grant_access( - obj=self.test_document_2, permission=permission_document_view + obj=self.test_documents[1], permission=permission_document_view ) queryset = document_search.search( {'q': 'first OR second'}, user=self._test_case_user ) self.assertEqual(queryset.count(), 2) - self.assertTrue(self.test_document in queryset) - self.assertTrue(self.test_document_2 in queryset) + self.assertTrue(self.test_documents[0] in queryset) + self.assertTrue(self.test_documents[1] in queryset) def test_advanced_or_search(self): self.upload_document(label='first_doc') self.grant_access( - obj=self.test_document, permission=permission_document_view + obj=self.test_documents[0], permission=permission_document_view ) - self.test_document_2 = self.upload_document(label='second_doc') + self.upload_document(label='second_doc') self.grant_access( - obj=self.test_document_2, permission=permission_document_view + obj=self.test_documents[1], permission=permission_document_view ) queryset = document_search.search( {'label': 'first OR second'}, user=self._test_case_user ) self.assertEqual(queryset.count(), 2) - self.assertTrue(self.test_document in queryset) - self.assertTrue(self.test_document_2 in queryset) + self.assertTrue(self.test_documents[0] in queryset) + self.assertTrue(self.test_documents[1] in queryset) def test_simple_and_search(self): self.upload_document(label='second_doc') @@ -109,10 +109,10 @@ class DocumentSearchTestCase(DocumentTestMixin, BaseTestCase): self.assertEqual(queryset.count(), 0) def test_simple_negated_search(self): - self.test_document_2 = self.upload_document(label='second_doc') + self.upload_document(label='second_doc') self.grant_access( - obj=self.test_document_2, permission=permission_document_view + obj=self.test_document, permission=permission_document_view ) queryset = document_search.search( diff --git a/mayan/apps/dynamic_search/tests/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py index a7c01d73bd..649f1ea2d2 100644 --- a/mayan/apps/dynamic_search/tests/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -10,21 +10,20 @@ class Issue46TestCase(DocumentTestMixin, GenericViewTestCase): """ Functional tests to make sure issue 46 is fixed """ + auto_upload_document = False + def setUp(self): super(Issue46TestCase, self).setUp() self.test_document_count = 4 - self.uploaded_documents = [] # Upload many instances of the same test document for i in range(self.test_document_count): - self.uploaded_documents.append( - self.upload_document() - ) + self.upload_document() def test_advanced_search_past_first_page(self): - test_document_label = self.uploaded_documents[0].label + test_document_label = self.test_documents[0].label - for document in self.uploaded_documents: + for document in self.test_documents: self.grant_access( obj=document, permission=permission_document_view ) diff --git a/mayan/apps/file_metadata/tests/test_classes.py b/mayan/apps/file_metadata/tests/test_classes.py index a754d556e6..42c8c5a74f 100644 --- a/mayan/apps/file_metadata/tests/test_classes.py +++ b/mayan/apps/file_metadata/tests/test_classes.py @@ -14,8 +14,8 @@ class EXIFToolDriverTestCase(DocumentTestMixin, BaseTestCase): test_document_filename = TEST_PDF_DOCUMENT_FILENAME def test_driver_entries(self): - self.document.submit_for_file_metadata_processing() - value = self.document.get_file_metadata( + self.test_document.submit_for_file_metadata_processing() + value = self.test_document.get_file_metadata( dotted_name=TEST_PDF_FILE_METADATA_DOTTED_NAME ) self.assertEqual(value, TEST_PDF_FILE_METADATA_VALUE) diff --git a/mayan/apps/file_metadata/tests/test_events.py b/mayan/apps/file_metadata/tests/test_events.py index a577ed4103..0c4a4a5188 100644 --- a/mayan/apps/file_metadata/tests/test_events.py +++ b/mayan/apps/file_metadata/tests/test_events.py @@ -13,13 +13,13 @@ from ..events import ( class FileMetadataEventsTestCase(GenericDocumentTestCase): def test_document_version_finish_event(self): Action.objects.all().delete() - self.document.latest_version.submit_for_file_metadata_processing() + self.test_document.latest_version.submit_for_file_metadata_processing() # Get the most recent action action = Action.objects.order_by('-timestamp').first() self.assertEqual( - action.target, self.document.latest_version + action.target, self.test_document.latest_version ) self.assertEqual( action.verb, event_file_metadata_document_version_finish.id @@ -27,13 +27,13 @@ class FileMetadataEventsTestCase(GenericDocumentTestCase): def test_document_version_submit_event(self): Action.objects.all().delete() - self.document.latest_version.submit_for_file_metadata_processing() + self.test_document.latest_version.submit_for_file_metadata_processing() # Get the oldest action action = Action.objects.order_by('-timestamp').last() self.assertEqual( - action.target, self.document.latest_version + action.target, self.test_document.latest_version ) self.assertEqual( action.verb, event_file_metadata_document_version_submit.id diff --git a/mayan/apps/file_metadata/tests/test_views.py b/mayan/apps/file_metadata/tests/test_views.py index ebed4dd71f..7ddfbbf8f0 100644 --- a/mayan/apps/file_metadata/tests/test_views.py +++ b/mayan/apps/file_metadata/tests/test_views.py @@ -16,12 +16,12 @@ from .literals import TEST_FILE_METADATA_KEY class FileMetadataViewsTestCase(GenericDocumentViewTestCase): def setUp(self): super(FileMetadataViewsTestCase, self).setUp() - self.test_driver = self.document.latest_version.file_metadata_drivers.first() + self.test_driver = self.test_document.latest_version.file_metadata_drivers.first() def _request_document_version_driver_list_view(self): return self.get( viewname='file_metadata:document_driver_list', - kwargs={'document_id': self.document.pk} + kwargs={'document_id': self.test_document.pk} ) def test_document_version_driver_list_view_no_permission(self): @@ -30,12 +30,12 @@ class FileMetadataViewsTestCase(GenericDocumentViewTestCase): def test_document_version_driver_list_view_with_access(self): self.grant_access( - permission=permission_file_metadata_view, obj=self.document + permission=permission_file_metadata_view, obj=self.test_document ) response = self._request_document_version_driver_list_view() self.assertContains( - response=response, text=self.document.label, status_code=200 + response=response, text=self.test_document.label, status_code=200 ) def _request_document_version_file_metadata_list_view(self): @@ -54,7 +54,7 @@ class FileMetadataViewsTestCase(GenericDocumentViewTestCase): def test_document_version_file_metadata_list_view_with_access(self): self.grant_access( - obj=self.document, permission=permission_file_metadata_view + obj=self.test_document, permission=permission_file_metadata_view ) response = self._request_document_version_file_metadata_list_view() @@ -65,61 +65,61 @@ class FileMetadataViewsTestCase(GenericDocumentViewTestCase): def _request_document_submit_view(self): return self.post( viewname='file_metadata:document_submit', - kwargs={'document_id': self.document.pk} + kwargs={'document_id': self.test_document.pk} ) def test_document_submit_view_no_permission(self): - self.document.latest_version.file_metadata_drivers.all().delete() + self.test_document.latest_version.file_metadata_drivers.all().delete() response = self._request_document_submit_view() self.assertEqual(response.status_code, 404) self.assertEqual( - self.document.latest_version.file_metadata_drivers.count(), 0 + self.test_document.latest_version.file_metadata_drivers.count(), 0 ) def test_document_submit_view_with_access(self): - self.document.latest_version.file_metadata_drivers.all().delete() + self.test_document.latest_version.file_metadata_drivers.all().delete() self.grant_access( - permission=permission_file_metadata_submit, obj=self.document + permission=permission_file_metadata_submit, obj=self.test_document ) response = self._request_document_submit_view() self.assertEqual(response.status_code, 302) self.assertEqual( - self.document.latest_version.file_metadata_drivers.count(), 1 + self.test_document.latest_version.file_metadata_drivers.count(), 1 ) def _request_multiple_document_submit_view(self): return self.post( viewname='file_metadata:document_multiple_submit', data={ - 'id_list': self.document.pk, + 'id_list': self.test_document.pk, } ) def test_multiple_document_submit_view_no_permission(self): - self.document.latest_version.file_metadata_drivers.all().delete() + self.test_document.latest_version.file_metadata_drivers.all().delete() response = self._request_multiple_document_submit_view() self.assertEqual(response.status_code, 404) self.assertEqual( - self.document.latest_version.file_metadata_drivers.count(), 0 + self.test_document.latest_version.file_metadata_drivers.count(), 0 ) def test_multiple_document_submit_view_with_access(self): - self.document.latest_version.file_metadata_drivers.all().delete() + self.test_document.latest_version.file_metadata_drivers.all().delete() self.grant_access( - permission=permission_file_metadata_submit, obj=self.document + permission=permission_file_metadata_submit, obj=self.test_document ) response = self._request_multiple_document_submit_view() self.assertEqual(response.status_code, 302) self.assertEqual( - self.document.latest_version.file_metadata_drivers.count(), 1 + self.test_document.latest_version.file_metadata_drivers.count(), 1 ) @@ -127,7 +127,7 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase): def _request_document_type_settings_view(self): return self.get( viewname='file_metadata:document_type_settings', - kwargs={'document_type_id': self.document.document_type.pk} + kwargs={'document_type_id': self.test_document.document_type.pk} ) def test_document_type_settings_view_no_permission(self): @@ -136,7 +136,7 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase): def test_document_type_settings_view_with_access(self): self.grant_access( - obj=self.document_type, + obj=self.test_document_type, permission=permission_document_type_file_metadata_setup ) @@ -146,7 +146,7 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase): def _request_document_type_submit_view(self): return self.post( viewname='file_metadata:document_type_submit', data={ - 'document_type': self.document_type.pk, + 'document_type': self.test_document_type.pk, } ) @@ -155,17 +155,17 @@ class DocumentTypeViewsTestCase(GenericDocumentViewTestCase): self.assertEqual(response.status_code, 200) self.assertEqual( - self.document.latest_version.file_metadata_drivers.count(), 0 + self.test_document.latest_version.file_metadata_drivers.count(), 0 ) def test_document_type_submit_view_with_access(self): self.grant_access( - obj=self.document_type, permission=permission_file_metadata_submit + obj=self.test_document_type, permission=permission_file_metadata_submit ) response = self._request_document_type_submit_view() self.assertEqual(response.status_code, 302) self.assertEqual( - self.document.latest_version.file_metadata_drivers.count(), 1 + self.test_document.latest_version.file_metadata_drivers.count(), 1 ) diff --git a/mayan/apps/mailer/tests/test_models.py b/mayan/apps/mailer/tests/test_models.py index c60d285e3f..376e4ba669 100644 --- a/mayan/apps/mailer/tests/test_models.py +++ b/mayan/apps/mailer/tests/test_models.py @@ -35,17 +35,17 @@ class ModelTestCase(MailerTestMixin, GenericDocumentTestCase): def test_send_attachment(self): self._create_test_user_mailer() self.test_user_mailer.send_document( - to=TEST_EMAIL_ADDRESS, document=self.document, as_attachment=True + to=TEST_EMAIL_ADDRESS, document=self.test_document, as_attachment=True ) self.assertEqual(len(mail.outbox), 1) self.assertEqual(mail.outbox[0].from_email, TEST_EMAIL_FROM_ADDRESS) self.assertEqual(mail.outbox[0].to, [TEST_EMAIL_ADDRESS]) - with self.document.open() as file_object: + with self.test_document.open() as file_object: self.assertEqual( mail.outbox[0].attachments[0], ( - self.document.label, file_object.read(), - self.document.file_mimetype + self.test_document.label, file_object.read(), + self.test_document.file_mimetype ) ) diff --git a/mayan/apps/metadata/tests/test_views.py b/mayan/apps/metadata/tests/test_views.py index 55a41df41c..43b8b87b9e 100644 --- a/mayan/apps/metadata/tests/test_views.py +++ b/mayan/apps/metadata/tests/test_views.py @@ -196,7 +196,7 @@ class DocumentMetadataTestCase(GenericDocumentViewTestCase): self._create_test_document_metadata() self.grant_access( - obj=self.document, permission=permission_document_metadata_remove, + obj=self.test_document, permission=permission_document_metadata_remove, ) # Silence unrelated logging diff --git a/mayan/apps/mirroring/tests/test_filesystems.py b/mayan/apps/mirroring/tests/test_filesystems.py index 003c9b1949..3036f929f6 100644 --- a/mayan/apps/mirroring/tests/test_filesystems.py +++ b/mayan/apps/mirroring/tests/test_filesystems.py @@ -29,12 +29,12 @@ class IndexFilesystemTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): link_documents=True ) - document = self.upload_document() + self.upload_document() index_filesystem = IndexFilesystem(index_slug=self.test_index.slug) self.assertEqual( index_filesystem.access( - '/{}/{}'.format(TEST_NODE_EXPRESSION, document.label) + '/{}/{}'.format(TEST_NODE_EXPRESSION, self.test_document.label) ), None ) @@ -46,12 +46,12 @@ class IndexFilesystemTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): link_documents=True ) - document = self.upload_document() + self.upload_document() index_filesystem = IndexFilesystem(index_slug=self.test_index.slug) with self.assertRaises(FuseOSError): index_filesystem.access( - '/{}/{}_non_valid'.format(TEST_NODE_EXPRESSION, document.label) + '/{}/{}_non_valid'.format(TEST_NODE_EXPRESSION, self.test_document.label) ) def test_document_open(self): @@ -62,20 +62,22 @@ class IndexFilesystemTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): link_documents=True ) - document = self.upload_document() + self.upload_document() index_filesystem = IndexFilesystem(index_slug=self.test_index.slug) file_handle = index_filesystem.open( - '/{}/{}'.format(TEST_NODE_EXPRESSION, document.label), 'rb' + '/{}/{}'.format(TEST_NODE_EXPRESSION, self.test_document.label), + 'rb' ) self.assertEqual( hashlib.sha256( index_filesystem.read( - path=None, size=document.size, offset=0, fh=file_handle + fh=file_handle, offset=0, path=None, + size=self.test_document.size ) ).hexdigest(), - document.checksum + self.test_document.checksum ) def test_multiline_indexes(self): @@ -139,8 +141,8 @@ class IndexFilesystemTestCase(IndexTestMixin, DocumentTestMixin, BaseTestCase): link_documents=True ) - self.document = Document.objects.create( - document_type=self.document_type, label='document_stub' + self.test_document = Document.objects.create( + document_type=self.test_document_type, label='document_stub' ) index_filesystem = IndexFilesystem(index_slug=self.test_index.slug) self.test_index.rebuild() diff --git a/mayan/apps/ocr/tests/test_events.py b/mayan/apps/ocr/tests/test_events.py index 4ea851b18d..231182dcb1 100644 --- a/mayan/apps/ocr/tests/test_events.py +++ b/mayan/apps/ocr/tests/test_events.py @@ -12,13 +12,13 @@ from ..events import ( class OCREventsTestCase(GenericDocumentTestCase): def test_document_version_submit_event(self): Action.objects.all().delete() - self.document.submit_for_ocr() + self.test_document.submit_for_ocr() # Get the oldest action action = Action.objects.order_by('-timestamp').last() self.assertEqual( - action.target, self.document.latest_version + action.target, self.test_document.latest_version ) self.assertEqual( action.verb, event_ocr_document_version_submit.id @@ -26,13 +26,13 @@ class OCREventsTestCase(GenericDocumentTestCase): def test_document_version_finish_event(self): Action.objects.all().delete() - self.document.submit_for_ocr() + self.test_document.submit_for_ocr() # Get the most recent action action = Action.objects.order_by('-timestamp').first() self.assertEqual( - action.target, self.document.latest_version + action.target, self.test_document.latest_version ) self.assertEqual( action.verb, event_ocr_document_version_finish.id diff --git a/mayan/apps/ocr/tests/test_indexing.py b/mayan/apps/ocr/tests/test_indexing.py index b5e1881b1a..2e785f391f 100644 --- a/mayan/apps/ocr/tests/test_indexing.py +++ b/mayan/apps/ocr/tests/test_indexing.py @@ -16,7 +16,7 @@ class OCRIndexingTestCase(DocumentTestMixin, BaseTestCase): def test_ocr_indexing(self): index = Index.objects.create(label=TEST_INDEX_LABEL) - index.document_types.add(self.document_type) + index.document_types.add(self.test_document_type) root = index.template_root index.node_templates.create( diff --git a/mayan/apps/ocr/tests/test_models.py b/mayan/apps/ocr/tests/test_models.py index 2e95793988..d2a842054a 100644 --- a/mayan/apps/ocr/tests/test_models.py +++ b/mayan/apps/ocr/tests/test_models.py @@ -20,7 +20,7 @@ class DocumentOCRTestCase(DocumentTestMixin, BaseTestCase): _skip_file_descriptor_test = True def test_ocr_language_backends_end(self): - content = self.document.pages.first().ocr_content.content + content = self.test_document.pages.first().ocr_content.content self.assertTrue(TEST_DOCUMENT_CONTENT in content) diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index 50a401684d..6eeaad3bca 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -44,7 +44,7 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): 'source_id': self.source.pk }, data={ 'source-file': file_object, - 'document_type_id': self.document_type.pk, + 'document_type_id': self.test_document_type.pk, } ) @@ -53,7 +53,7 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): self.source.save() self.grant_access( - obj=self.document_type, permission=permission_document_create + obj=self.test_document_type, permission=permission_document_create ) response = self._request_upload_wizard_view( @@ -98,7 +98,7 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): # Create an access control entry giving the role the document # create permission for the selected document type. self.grant_access( - obj=self.document_type, permission=permission_document_create + obj=self.test_document_type, permission=permission_document_create ) with open(TEST_SMALL_DOCUMENT_PATH, mode='rb') as file_object: @@ -107,7 +107,7 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): 'source_id': self.source.pk }, data={ 'source-file': file_object, - 'document_type_id': self.document_type.pk, + 'document_type_id': self.test_document_type.pk, } ) self.assertEqual(response.status_code, 302) @@ -117,7 +117,7 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): def _request_upload_interactive_view(self): return self.get( viewname='sources:upload_interactive', data={ - 'document_type_id': self.document_type.pk, + 'document_type_id': self.test_document_type.pk, } ) @@ -127,7 +127,7 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): def test_upload_interactive_view_with_access(self): self.grant_access( - permission=permission_document_create, obj=self.document_type + permission=permission_document_create, obj=self.test_document_type ) response = self._request_upload_interactive_view() self.assertContains( @@ -204,7 +204,7 @@ class NewDocumentVersionViewTestCase(GenericDocumentViewTestCase): response = self.post( viewname='sources:upload_version', kwargs={ - 'document_pk': self.document.pk + 'document_pk': self.test_document.pk }, follow=True ) @@ -215,7 +215,7 @@ class NewDocumentVersionViewTestCase(GenericDocumentViewTestCase): response = self.get( viewname='documents:document_version_list', kwargs={ - 'pk': self.document.pk + 'pk': self.test_document.pk }, follow=True ) diff --git a/mayan/apps/tags/tests/test_actions.py b/mayan/apps/tags/tests/test_actions.py index bc7bb0fa11..8429146a1e 100644 --- a/mayan/apps/tags/tests/test_actions.py +++ b/mayan/apps/tags/tests/test_actions.py @@ -17,15 +17,15 @@ class TagActionTestCase(ActionTestCase): def test_tag_attach_action(self): action = AttachTagAction(form_data={'tags': Tag.objects.all()}) - action.execute(context={'document': self.document}) + action.execute(context={'document': self.test_document}) self.assertEqual(self.tag.documents.count(), 1) - self.assertEqual(list(self.tag.documents.all()), [self.document]) + self.assertEqual(list(self.tag.documents.all()), [self.test_document]) def test_tag_remove_action(self): - self.tag.attach_to(document=self.document) + self.tag.attach_to(document=self.test_document) action = RemoveTagAction(form_data={'tags': Tag.objects.all()}) - action.execute(context={'document': self.document}) + action.execute(context={'document': self.test_document}) self.assertEqual(self.tag.documents.count(), 0) diff --git a/mayan/apps/tags/tests/test_models.py b/mayan/apps/tags/tests/test_models.py index 65b8653156..c0df95db9c 100644 --- a/mayan/apps/tags/tests/test_models.py +++ b/mayan/apps/tags/tests/test_models.py @@ -11,7 +11,7 @@ class TagTestCase(DocumentTestMixin, TagTestMixin, BaseTestCase): def test_document_addition(self): self._create_test_tag() - self.test_document = self.upload_document() + self.upload_document() self.test_tag.documents.add(self.test_document) @@ -19,7 +19,7 @@ class TagTestCase(DocumentTestMixin, TagTestMixin, BaseTestCase): def test_document_remove(self): self._create_test_tag() - self.test_document = self.upload_document() + self.upload_document() self.test_tag.documents.remove(self.test_document) diff --git a/mayan/apps/tags/tests/test_views.py b/mayan/apps/tags/tests/test_views.py index f0181bcb13..0a141b5eaa 100644 --- a/mayan/apps/tags/tests/test_views.py +++ b/mayan/apps/tags/tests/test_views.py @@ -119,7 +119,7 @@ class TagDocumentViewTestCase(TagTestMixin, TagViewTestMixin, GenericDocumentVie self.grant_access(obj=self.test_tag, permission=permission_tag_view) self.grant_access( - obj=self.document, permission=permission_document_view + obj=self.test_document, permission=permission_document_view ) response = self._request_test_tag_document_list_view() diff --git a/mayan/apps/tags/tests/test_wizard_steps.py b/mayan/apps/tags/tests/test_wizard_steps.py index c225b3e52e..d844bc78d9 100644 --- a/mayan/apps/tags/tests/test_wizard_steps.py +++ b/mayan/apps/tags/tests/test_wizard_steps.py @@ -43,7 +43,7 @@ class TaggedDocumentUploadTestCase(TagTestMixin, GenericDocumentViewTestCase): self._create_test_tag() self.grant_access( - obj=self.document_type, permission=permission_document_create + obj=self.test_document_type, permission=permission_document_create ) response = self._request_upload_interactive_document_create_view() self.assertEqual(response.status_code, 302) diff --git a/mayan/apps/user_management/tests/test_views.py b/mayan/apps/user_management/tests/test_views.py index e64654d2fc..901b7f0805 100644 --- a/mayan/apps/user_management/tests/test_views.py +++ b/mayan/apps/user_management/tests/test_views.py @@ -381,19 +381,19 @@ class MetadataLookupIntegrationTestCase(GenericDocumentViewTestCase): name=TEST_METADATA_TYPE_NAME, label=TEST_METADATA_TYPE_LABEL ) - self.document_type.metadata.create(metadata_type=self.metadata_type) + self.test_document_type.metadata.create(metadata_type=self.metadata_type) def test_user_list_lookup_render(self): self.metadata_type.lookup = '{{ users }}' self.metadata_type.save() - self.document.metadata.create(metadata_type=self.metadata_type) + self.test_document.metadata.create(metadata_type=self.metadata_type) self.grant_access( - obj=self.document, permission=permission_document_metadata_edit + obj=self.test_document, permission=permission_document_metadata_edit ) response = self.get( viewname='metadata:metadata_edit', kwargs={ - 'pk': self.document.pk + 'pk': self.test_document.pk } ) self.assertContains( @@ -405,13 +405,13 @@ class MetadataLookupIntegrationTestCase(GenericDocumentViewTestCase): def test_group_list_lookup_render(self): self.metadata_type.lookup = '{{ groups }}' self.metadata_type.save() - self.document.metadata.create(metadata_type=self.metadata_type) + self.test_document.metadata.create(metadata_type=self.metadata_type) self.grant_access( - obj=self.document, permission=permission_document_metadata_edit + obj=self.test_document, permission=permission_document_metadata_edit ) response = self.get( - viewname='metadata:metadata_edit', kwargs={'pk': self.document.pk} + viewname='metadata:metadata_edit', kwargs={'pk': self.test_document.pk} ) self.assertContains(