diff --git a/mayan/apps/acls/tests/test_views.py b/mayan/apps/acls/tests/test_views.py index ca7884e398..e338a99109 100644 --- a/mayan/apps/acls/tests/test_views.py +++ b/mayan/apps/acls/tests/test_views.py @@ -23,7 +23,7 @@ class AccessControlListViewTestCase(ACLTestMixin, GenericViewTestCase): acl_count = AccessControlList.objects.count() response = self._request_test_acl_create_get_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) self.assertEqual(AccessControlList.objects.count(), acl_count) @@ -36,7 +36,7 @@ class AccessControlListViewTestCase(ACLTestMixin, GenericViewTestCase): acl_count = AccessControlList.objects.count() response = self._request_test_acl_create_get_view() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.assertEqual(AccessControlList.objects.count(), acl_count) @@ -54,7 +54,7 @@ class AccessControlListViewTestCase(ACLTestMixin, GenericViewTestCase): acl_count = AccessControlList.objects.count() response = self._request_test_acl_create_post_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) self.assertEqual(AccessControlList.objects.count(), acl_count) @@ -68,7 +68,7 @@ class AccessControlListViewTestCase(ACLTestMixin, GenericViewTestCase): acl_count = AccessControlList.objects.count() response = self._request_test_acl_create_post_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.assertEqual(AccessControlList.objects.count(), acl_count + 1) diff --git a/mayan/apps/cabinets/tests/test_views.py b/mayan/apps/cabinets/tests/test_views.py index 3e8ad35871..7f17e53058 100644 --- a/mayan/apps/cabinets/tests/test_views.py +++ b/mayan/apps/cabinets/tests/test_views.py @@ -17,7 +17,7 @@ from .mixins import CabinetTestMixin, CabinetViewTestMixin class CabinetViewTestCase(CabinetTestMixin, CabinetViewTestMixin, GenericViewTestCase): def test_cabinet_create_view_no_permission(self): response = self._request_test_cabinet_create_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) self.assertEqual(Cabinet.objects.count(), 0) diff --git a/mayan/apps/checkouts/tests/test_views.py b/mayan/apps/checkouts/tests/test_views.py index 23d4ca8aa7..6b4648145f 100644 --- a/mayan/apps/checkouts/tests/test_views.py +++ b/mayan/apps/checkouts/tests/test_views.py @@ -58,7 +58,7 @@ class DocumentCheckoutViewTestCase(DocumentCheckoutTestMixin, GenericDocumentVie self._check_out_test_document() response = self._request_document_check_in_post_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) self.assertTrue(self.test_document.is_checked_out()) @@ -70,7 +70,7 @@ class DocumentCheckoutViewTestCase(DocumentCheckoutTestMixin, GenericDocumentVie ) response = self._request_document_check_in_post_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.assertFalse(self.test_document.is_checked_out()) self.assertFalse( @@ -92,7 +92,7 @@ class DocumentCheckoutViewTestCase(DocumentCheckoutTestMixin, GenericDocumentVie def test_check_out_document_view_no_permission(self): response = self._request_document_checkout_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) self.assertFalse(self.test_document.is_checked_out()) @@ -106,7 +106,7 @@ class DocumentCheckoutViewTestCase(DocumentCheckoutTestMixin, GenericDocumentVie ) response = self._request_document_checkout_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.assertTrue(self.test_document.is_checked_out()) diff --git a/mayan/apps/document_indexing/tests/test_views.py b/mayan/apps/document_indexing/tests/test_views.py index 30e83a574a..633939b576 100644 --- a/mayan/apps/document_indexing/tests/test_views.py +++ b/mayan/apps/document_indexing/tests/test_views.py @@ -17,7 +17,7 @@ from .mixins import IndexTestMixin, IndexViewTestMixin class IndexViewTestCase(IndexTestMixin, IndexViewTestMixin, GenericDocumentViewTestCase): def test_index_create_view_no_permission(self): response = self._request_test_index_create_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) self.assertEqual(Index.objects.count(), 0) diff --git a/mayan/apps/document_states/tests/test_workflow_state_views.py b/mayan/apps/document_states/tests/test_workflow_state_views.py index c44d8a37e7..30fcb5dedf 100644 --- a/mayan/apps/document_states/tests/test_workflow_state_views.py +++ b/mayan/apps/document_states/tests/test_workflow_state_views.py @@ -18,9 +18,9 @@ class WorkflowStateViewTestCase( self._create_test_workflow() response = self._request_test_workflow_state_create_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) - self.assertEquals(WorkflowState.objects.count(), 0) + self.assertEqual(WorkflowState.objects.count(), 0) def test_create_workflow_state_with_access(self): self._create_test_workflow() @@ -30,13 +30,13 @@ class WorkflowStateViewTestCase( ) response = self._request_test_workflow_state_create_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) - self.assertEquals(WorkflowState.objects.count(), 1) - self.assertEquals( + self.assertEqual(WorkflowState.objects.count(), 1) + self.assertEqual( WorkflowState.objects.all()[0].label, TEST_WORKFLOW_STATE_LABEL ) - self.assertEquals( + self.assertEqual( WorkflowState.objects.all()[0].completion, TEST_WORKFLOW_STATE_COMPLETION ) @@ -51,13 +51,13 @@ class WorkflowStateViewTestCase( response = self._request_test_workflow_state_create_view( extra_data={'completion': ''} ) - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) - self.assertEquals(WorkflowState.objects.count(), 1) - self.assertEquals( + self.assertEqual(WorkflowState.objects.count(), 1) + self.assertEqual( WorkflowState.objects.all()[0].label, TEST_WORKFLOW_STATE_LABEL ) - self.assertEquals( + self.assertEqual( WorkflowState.objects.all()[0].completion, 0 ) @@ -66,9 +66,9 @@ class WorkflowStateViewTestCase( self._create_test_workflow_states() response = self._request_test_workflow_state_delete_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) - self.assertEquals(WorkflowState.objects.count(), 2) + self.assertEqual(WorkflowState.objects.count(), 2) def test_delete_workflow_state_with_access(self): self._create_test_workflow() @@ -79,8 +79,8 @@ class WorkflowStateViewTestCase( ) response = self._request_test_workflow_state_delete_view() - self.assertEquals(response.status_code, 302) - self.assertEquals(WorkflowState.objects.count(), 1) + self.assertEqual(response.status_code, 302) + self.assertEqual(WorkflowState.objects.count(), 1) def test_edit_workflow_state_no_access(self): self._create_test_workflow() @@ -89,10 +89,10 @@ class WorkflowStateViewTestCase( workflow_state_label = self.test_workflow_state_1.label response = self._request_test_workflow_state_edit_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) self.test_workflow_state_1.refresh_from_db() - self.assertEquals( + self.assertEqual( self.test_workflow_state_1.label, workflow_state_label ) @@ -107,7 +107,7 @@ class WorkflowStateViewTestCase( workflow_state_label = self.test_workflow_state_1.label response = self._request_test_workflow_state_edit_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.test_workflow_state_1.refresh_from_db() self.assertNotEquals( @@ -119,7 +119,7 @@ class WorkflowStateViewTestCase( self._create_test_workflow_states() response = self._request_test_workflow_state_list_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) def test_workflow_state_list_with_access(self): self._create_test_workflow() @@ -130,5 +130,5 @@ class WorkflowStateViewTestCase( ) response = self._request_test_workflow_state_list_view() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.assertContains(response, text=self.test_workflow_state_1.label) diff --git a/mayan/apps/document_states/tests/test_workflow_transition_views.py b/mayan/apps/document_states/tests/test_workflow_transition_views.py index a26d17e9f8..1eb8dfb133 100644 --- a/mayan/apps/document_states/tests/test_workflow_transition_views.py +++ b/mayan/apps/document_states/tests/test_workflow_transition_views.py @@ -26,9 +26,9 @@ class WorkflowTransitionViewTestCase( self._create_test_workflow_states() response = self._request_test_workflow_transition_create_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) - self.assertEquals(WorkflowTransition.objects.count(), 0) + self.assertEqual(WorkflowTransition.objects.count(), 0) def test_create_test_workflow_transition_with_access(self): self._create_test_workflow() @@ -39,18 +39,18 @@ class WorkflowTransitionViewTestCase( ) response = self._request_test_workflow_transition_create_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) - self.assertEquals(WorkflowTransition.objects.count(), 1) - self.assertEquals( + self.assertEqual(WorkflowTransition.objects.count(), 1) + self.assertEqual( WorkflowTransition.objects.all()[0].label, TEST_WORKFLOW_TRANSITION_LABEL ) - self.assertEquals( + self.assertEqual( WorkflowTransition.objects.all()[0].origin_state, self.test_workflow_state_1 ) - self.assertEquals( + self.assertEqual( WorkflowTransition.objects.all()[0].destination_state, self.test_workflow_state_2 ) @@ -61,7 +61,7 @@ class WorkflowTransitionViewTestCase( self._create_test_workflow_transition() response = self._request_test_workflow_transition_delete_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) self.assertTrue( self.test_workflow_transition in WorkflowTransition.objects.all() @@ -75,7 +75,7 @@ class WorkflowTransitionViewTestCase( self.grant_access(permission=permission_workflow_edit, obj=self.test_workflow) response = self._request_test_workflow_transition_delete_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.assertFalse( self.test_workflow_transition in WorkflowTransition.objects.all() @@ -87,7 +87,7 @@ class WorkflowTransitionViewTestCase( self._create_test_workflow_transition() response = self._request_test_workflow_transition_edit_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) self.test_workflow_transition.refresh_from_db() self.assertEqual( @@ -104,7 +104,7 @@ class WorkflowTransitionViewTestCase( ) response = self._request_test_workflow_transition_edit_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.test_workflow_transition.refresh_from_db() self.assertEqual( @@ -219,7 +219,7 @@ class WorkflowTransitionEventViewTestCase( self._create_test_workflow_transition() response = self._request_test_workflow_transition_event_list_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) def test_workflow_transition_event_list_with_access(self): self._create_test_workflow() @@ -231,4 +231,4 @@ class WorkflowTransitionEventViewTestCase( ) response = self._request_test_workflow_transition_event_list_view() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) diff --git a/mayan/apps/document_states/tests/test_workflow_views.py b/mayan/apps/document_states/tests/test_workflow_views.py index c9747af486..24df83a095 100644 --- a/mayan/apps/document_states/tests/test_workflow_views.py +++ b/mayan/apps/document_states/tests/test_workflow_views.py @@ -19,24 +19,24 @@ class WorkflowViewTestCase( ): def test_workflow_create_view_no_permission(self): response = self._request_test_workflow_create_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) - self.assertEquals(Workflow.objects.count(), 0) + self.assertEqual(Workflow.objects.count(), 0) def test_workflow_create_view_with_permission(self): self.grant_permission(permission=permission_workflow_create) response = self._request_test_workflow_create_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) - self.assertEquals(Workflow.objects.count(), 1) - self.assertEquals(Workflow.objects.all()[0].label, TEST_WORKFLOW_LABEL) + self.assertEqual(Workflow.objects.count(), 1) + self.assertEqual(Workflow.objects.all()[0].label, TEST_WORKFLOW_LABEL) def test_workflow_delete_view_no_access(self): self._create_test_workflow() response = self._request_test_workflow_delete_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) self.assertTrue(self.test_workflow in Workflow.objects.all()) @@ -48,7 +48,7 @@ class WorkflowViewTestCase( ) response = self._request_test_workflow_delete_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.assertFalse(self.test_workflow in Workflow.objects.all()) @@ -56,7 +56,7 @@ class WorkflowViewTestCase( self._create_test_workflow() response = self._request_test_workflow_edit_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) self.test_workflow.refresh_from_db() self.assertEqual(self.test_workflow.label, TEST_WORKFLOW_LABEL) @@ -69,7 +69,7 @@ class WorkflowViewTestCase( ) response = self._request_test_workflow_edit_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) self.test_workflow.refresh_from_db() self.assertEqual(self.test_workflow.label, TEST_WORKFLOW_LABEL_EDITED) @@ -79,7 +79,7 @@ class WorkflowViewTestCase( response = self._request_test_workflow_list_view() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.assertNotContains(response, text=self.test_workflow.label) def test_workflow_list_view_with_access(self): @@ -90,14 +90,14 @@ class WorkflowViewTestCase( ) response = self._request_test_workflow_list_view() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) self.assertContains(response, text=self.test_workflow.label) def test_workflow_preview_view_no_access(self): self._create_test_workflow() response = self._request_test_workflow_preview_view() - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) self.assertTrue(self.test_workflow in Workflow.objects.all()) @@ -108,7 +108,7 @@ class WorkflowViewTestCase( obj=self.test_workflow, permission=permission_workflow_view ) response = self._request_test_workflow_preview_view() - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) class WorkflowToolViewTestCase(WorkflowTestMixin, GenericDocumentViewTestCase): diff --git a/mayan/apps/linking/tests/test_views.py b/mayan/apps/linking/tests/test_views.py index 7546ccfd90..1fa62f79a7 100644 --- a/mayan/apps/linking/tests/test_views.py +++ b/mayan/apps/linking/tests/test_views.py @@ -20,7 +20,7 @@ from .mixins import SmartLinkTestMixin, SmartLinkViewTestMixin class SmartLinkViewTestCase(SmartLinkTestMixin, SmartLinkViewTestMixin, GenericViewTestCase): def test_smart_link_create_view_no_permission(self): response = self._request_test_smart_link_create_view() - self.assertEquals(response.status_code, 403) + self.assertEqual(response.status_code, 403) self.assertEqual(SmartLink.objects.count(), 0) diff --git a/mayan/apps/metadata/tests/test_views.py b/mayan/apps/metadata/tests/test_views.py index b882526b91..124b7cd34d 100644 --- a/mayan/apps/metadata/tests/test_views.py +++ b/mayan/apps/metadata/tests/test_views.py @@ -225,7 +225,7 @@ class DocumentMetadataTestCase( ) } ) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) # Test post to metadata removal view response = self.post( diff --git a/mayan/apps/mirroring/tests/test_caches.py b/mayan/apps/mirroring/tests/test_caches.py index e5d8f4ee5c..42249ce375 100644 --- a/mayan/apps/mirroring/tests/test_caches.py +++ b/mayan/apps/mirroring/tests/test_caches.py @@ -29,7 +29,7 @@ class IndexFilesystemCacheTestCase(BaseTestCase): def test_set_path_document(self): self.cache.set_path(path=TEST_PATH, document=self.test_document) - self.assertEquals( + self.assertEqual( {'document_pk': TEST_DOCUMENT_PK}, self.cache.get_path(path=TEST_PATH) ) @@ -38,11 +38,11 @@ class IndexFilesystemCacheTestCase(BaseTestCase): self.cache.set_path(path=TEST_PATH, document=self.test_document) self.cache.clear_document(document=self.test_document) - self.assertEquals(None, self.cache.get_path(path=TEST_PATH)) + self.assertEqual(None, self.cache.get_path(path=TEST_PATH)) def test_set_path_node(self): self.cache.set_path(path=TEST_PATH, node=self.node) - self.assertEquals( + self.assertEqual( {'node_pk': TEST_NODE_PK}, self.cache.get_path(path=TEST_PATH) ) @@ -51,7 +51,7 @@ class IndexFilesystemCacheTestCase(BaseTestCase): self.cache.set_path(path=TEST_PATH, node=self.node) self.cache.clear_node(node=self.node) - self.assertEquals(None, self.cache.get_path(path=TEST_PATH)) + self.assertEqual(None, self.cache.get_path(path=TEST_PATH)) def test_valid_cache_key_characters(self): with warnings.catch_warnings(record=True) as warning_list: diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index d6df9714c5..03ecbbc72d 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -338,7 +338,7 @@ class SourcesTestCase(GenericDocumentViewTestCase): self.grant_permission(permission=permission_sources_setup_view) response = self._request_setup_source_create_view() - self.assertEquals(response.status_code, 302) + self.assertEqual(response.status_code, 302) webform_source = WebFormSource.objects.first() self.assertEqual(webform_source.label, TEST_SOURCE_LABEL)