diff --git a/mayan/apps/document_indexing/tests/test_models.py b/mayan/apps/document_indexing/tests/test_models.py index 7205aaab81..c853e4b85e 100644 --- a/mayan/apps/document_indexing/tests/test_models.py +++ b/mayan/apps/document_indexing/tests/test_models.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from django.core.files.base import File from django.test import override_settings from common.tests import BaseTestCase @@ -26,7 +25,7 @@ class IndexTestCase(BaseTestCase): with open(TEST_SMALL_DOCUMENT_PATH) as file_object: self.document = self.document_type.new_document( - file_object=File(file_object) + file_object=file_object ) def tearDown(self): diff --git a/mayan/apps/document_states/tests/test_views.py b/mayan/apps/document_states/tests/test_views.py index 0dd34bb609..251f127f21 100644 --- a/mayan/apps/document_states/tests/test_views.py +++ b/mayan/apps/document_states/tests/test_views.py @@ -1,12 +1,6 @@ from __future__ import unicode_literals -from django.core.urlresolvers import reverse - from common.tests.test_views import GenericViewTestCase -from documents.models import DocumentType -from documents.tests.literals import ( - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH -) from ..models import Workflow, WorkflowState, WorkflowTransition @@ -23,24 +17,10 @@ class DocumentStateViewTestCase(GenericViewTestCase): self.login_admin_user() - self.document_type = DocumentType.objects.create( - label=TEST_DOCUMENT_TYPE - ) - - with open(TEST_SMALL_DOCUMENT_PATH) as file_object: - self.document = self.document_type.new_document( - file_object=file_object - ) - - def tearDown(self): - self.document_type.delete() - super(DocumentStateViewTestCase, self).tearDown() - def test_creating_workflow(self): - response = self.client.post( - reverse( - 'document_states:setup_workflow_create' - ), data={ + response = self.post( + 'document_states:setup_workflow_create', + data={ 'label': TEST_WORKFLOW_LABEL, }, follow=True ) @@ -56,10 +36,9 @@ class DocumentStateViewTestCase(GenericViewTestCase): self.assertEquals(Workflow.objects.count(), 1) self.assertEquals(Workflow.objects.all()[0].label, TEST_WORKFLOW_LABEL) - response = self.client.post( - reverse( - 'document_states:setup_workflow_delete', args=(workflow.pk,) - ), follow=True + response = self.post( + 'document_states:setup_workflow_delete', args=(workflow.pk,), + follow=True ) self.assertEquals(response.status_code, 200) @@ -69,11 +48,10 @@ class DocumentStateViewTestCase(GenericViewTestCase): def test_create_workflow_state(self): workflow = Workflow.objects.create(label=TEST_WORKFLOW_LABEL) - response = self.client.post( - reverse( - 'document_states:setup_workflow_state_create', - args=(workflow.pk,) - ), data={ + response = self.post( + 'document_states:setup_workflow_state_create', + args=(workflow.pk,), + data={ 'label': TEST_WORKFLOW_STATE_LABEL, 'completion': TEST_WORKFLOW_STATE_COMPLETION, }, follow=True @@ -97,11 +75,9 @@ class DocumentStateViewTestCase(GenericViewTestCase): completion=TEST_WORKFLOW_STATE_COMPLETION ) - response = self.client.post( - reverse( - 'document_states:setup_workflow_state_delete', - args=(workflow_state.pk,) - ), follow=True + response = self.post( + 'document_states:setup_workflow_state_delete', + args=(workflow_state.pk,), follow=True ) self.assertEquals(response.status_code, 200) @@ -120,11 +96,9 @@ class DocumentStateViewTestCase(GenericViewTestCase): completion=TEST_WORKFLOW_STATE_COMPLETION ) - response = self.client.post( - reverse( - 'document_states:setup_workflow_transition_create', - args=(workflow.pk,) - ), data={ + response = self.post( + 'document_states:setup_workflow_transition_create', + args=(workflow.pk,), data={ 'label': TEST_WORKFLOW_TRANSITION_LABEL, 'origin_state': workflow_initial_state.pk, 'destination_state': workflow_state.pk, @@ -165,11 +139,9 @@ class DocumentStateViewTestCase(GenericViewTestCase): self.assertEquals(WorkflowTransition.objects.count(), 1) - response = self.client.post( - reverse( - 'document_states:setup_workflow_transition_delete', - args=(workflow_transition.pk,) - ), follow=True + response = self.post( + 'document_states:setup_workflow_transition_delete', + args=(workflow_transition.pk,), follow=True ) self.assertEquals(response.status_code, 200) diff --git a/mayan/apps/dynamic_search/tests/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py index 633a084125..4b2baa8dbf 100644 --- a/mayan/apps/dynamic_search/tests/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from django.core.urlresolvers import reverse from django.test import override_settings from common.tests.test_views import GenericViewTestCase @@ -47,10 +46,9 @@ class Issue46TestCase(GenericViewTestCase): with self.settings(COMMON_PAGINATE_BY=2): # Funcitonal test for the first page of advanced results - response = self.client.get( - reverse( - 'search:results', args=(document_search.get_full_name(),) - ), {'label': 'test'} + response = self.get( + 'search:results', args=(document_search.get_full_name(),), + data={'label': 'test'} ) self.assertContains( @@ -59,10 +57,9 @@ class Issue46TestCase(GenericViewTestCase): ) # Functional test for the second page of advanced results - response = self.client.get( - reverse( - 'search:results', args=(document_search.get_full_name(),) - ), {'label': 'test', 'page': 2} + response = self.get( + 'search:results', args=(document_search.get_full_name(),), + data={'label': 'test', 'page': 2} ) self.assertContains( response, 'Total (3 - 4 out of 4) (Page 2 of 2)', diff --git a/mayan/apps/metadata/tests/test_models.py b/mayan/apps/metadata/tests/test_models.py index 0d0b89df83..868a34b26a 100644 --- a/mayan/apps/metadata/tests/test_models.py +++ b/mayan/apps/metadata/tests/test_models.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -from django.core.files.base import File from django.core.exceptions import ValidationError from django.test import override_settings @@ -34,7 +33,7 @@ class MetadataTestCase(BaseTestCase): with open(TEST_SMALL_DOCUMENT_PATH) as file_object: self.document = self.document_type.new_document( - file_object=File(file_object) + file_object=file_object ) def tearDown(self): diff --git a/mayan/apps/sources/tests/test_models.py b/mayan/apps/sources/tests/test_models.py index 0f8a4c298e..d7a1d88be9 100644 --- a/mayan/apps/sources/tests/test_models.py +++ b/mayan/apps/sources/tests/test_models.py @@ -3,9 +3,7 @@ from __future__ import unicode_literals import shutil from django.contrib.auth import get_user_model -from django.core.files.base import File from django.test import override_settings -from django.test.client import Client from common.utils import mkdtemp from common.tests import BaseTestCase @@ -39,7 +37,6 @@ class UploadDocumentTestCase(BaseTestCase): username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD ) - self.client = Client() def tearDown(self): self.document_type.delete() @@ -115,7 +112,7 @@ class CompressedUploadsTestCase(BaseTestCase): with open(TEST_COMPRESSED_DOCUMENT_PATH) as file_object: source.handle_upload( document_type=self.document_type, - file_object=File(file_object), + file_object=file_object, expand=(source.uncompress == SOURCE_UNCOMPRESS_CHOICE_Y) ) diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index a187354a1d..ed2e5c2590 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -3,14 +3,10 @@ from __future__ import unicode_literals import os import shutil -from django.contrib.auth import get_user_model -from django.core.urlresolvers import reverse -from django.test.client import Client from django.test import override_settings from acls.models import AccessControlList from checkouts.models import NewVersionBlock -from common.tests import BaseTestCase from common.tests.test_views import GenericViewTestCase from common.utils import fs_cleanup, mkdtemp from documents.models import Document, DocumentType @@ -20,9 +16,7 @@ from documents.tests import ( TEST_DOCUMENT_TYPE ) from documents.tests.test_views import GenericDocumentViewTestCase -from user_management.tests import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, -) + from ..links import link_upload_version from ..literals import SOURCE_CHOICE_WEB_FORM from ..models import StagingFolderSource, WebFormSource @@ -50,10 +44,8 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): self.login_user() with open(TEST_DOCUMENT_PATH) as file_object: - response = self.client.post( - reverse( - 'sources:upload_interactive', args=(self.source.pk,) - ), data={ + response = self.post( + 'sources:upload_interactive', args=(self.source.pk,), data={ 'source-file': file_object, 'document_type_id': self.document_type.pk, } @@ -68,10 +60,8 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): self.grant(permission_document_create) with open(TEST_DOCUMENT_PATH) as file_object: - response = self.client.post( - reverse( - 'sources:upload_interactive', args=(self.source.pk,) - ), data={ + response = self.post( + 'sources:upload_interactive', args=(self.source.pk,), data={ 'source-file': file_object, 'document_type_id': self.document_type.pk, }, follow=True @@ -96,10 +86,8 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): acl.permissions.add(permission_document_create.stored_permission) with open(TEST_DOCUMENT_PATH) as file_object: - response = self.client.post( - reverse( - 'sources:upload_interactive', args=(self.source.pk,) - ), data={ + response = self.post( + 'sources:upload_interactive', args=(self.source.pk,), data={ 'source-file': file_object, 'document_type_id': self.document_type.pk, }, follow=True @@ -110,44 +98,31 @@ class DocumentUploadTestCase(GenericDocumentViewTestCase): @override_settings(OCR_AUTO_OCR=False) -class DocumentUploadIssueTestCase(BaseTestCase): +class DocumentUploadIssueTestCase(GenericViewTestCase): def setUp(self): super(DocumentUploadIssueTestCase, self).setUp() self.document_type = DocumentType.objects.create( label=TEST_DOCUMENT_TYPE ) - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) - self.client = Client() - def tearDown(self): self.document_type.delete() super(DocumentUploadIssueTestCase, self).tearDown() def test_issue_25(self): - # Login the admin user - logged_in = self.client.login( - username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD - ) - self.assertTrue(logged_in) - self.assertTrue(self.admin_user.is_authenticated()) + self.login_admin_user() # Create new webform source - self.client.post( - reverse( - 'sources:setup_source_create', args=(SOURCE_CHOICE_WEB_FORM,) - ), {'label': 'test', 'uncompress': 'n', 'enabled': True} + self.post( + 'sources:setup_source_create', args=(SOURCE_CHOICE_WEB_FORM,), + data={'label': 'test', 'uncompress': 'n', 'enabled': True} ) self.assertEqual(WebFormSource.objects.count(), 1) # Upload the test document with open(TEST_SMALL_DOCUMENT_PATH) as file_descriptor: - self.client.post( - reverse('sources:upload_interactive'), - { + self.post( + 'sources:upload_interactive', data={ 'document-language': 'eng', 'source-file': file_descriptor, 'document_type_id': self.document_type.pk } @@ -165,9 +140,8 @@ class DocumentUploadIssueTestCase(BaseTestCase): self.assertEqual(document.description, TEST_DOCUMENT_DESCRIPTION) # Test for issue 25 during editing - self.client.post( - reverse('documents:document_edit', args=(document.pk,)), - { + self.post( + 'documents:document_edit', args=(document.pk,), data={ 'description': TEST_DOCUMENT_DESCRIPTION, 'language': document.language, 'label': document.label }