diff --git a/mayan/apps/authentication/tests/literals.py b/mayan/apps/authentication/tests/literals.py index afebd42a48..214cd1ff6c 100644 --- a/mayan/apps/authentication/tests/literals.py +++ b/mayan/apps/authentication/tests/literals.py @@ -1,10 +1,3 @@ from __future__ import unicode_literals -TEST_ADMIN_EMAIL = 'admin@example.com' -TEST_ADMIN_PASSWORD = 'test_admin_password' -TEST_ADMIN_USERNAME = 'test_admin' TEST_EMAIL_AUTHENTICATION_BACKEND = 'authentication.auth.email_auth_backend.EmailAuthBackend' - -TEST_USER_EMAIL = 'user@example.com' -TEST_USER_PASSWORD = 'test_user_password' -TEST_USER_USERNAME = 'test_user' diff --git a/mayan/apps/authentication/tests/test_views.py b/mayan/apps/authentication/tests/test_views.py index 6d9b7db0a2..edd4b3ef2f 100644 --- a/mayan/apps/authentication/tests/test_views.py +++ b/mayan/apps/authentication/tests/test_views.py @@ -6,11 +6,12 @@ from django.core.urlresolvers import reverse from django.test import TestCase, override_settings from django.test.client import Client -from .literals import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, - TEST_EMAIL_AUTHENTICATION_BACKEND +from user_management.tests.literals import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME ) +from .literals import TEST_EMAIL_AUTHENTICATION_BACKEND + class UserLoginTestCase(TestCase): """ diff --git a/mayan/apps/checkouts/tests/test_models.py b/mayan/apps/checkouts/tests/test_models.py index 72f8fb03b5..61cb7da9ca 100644 --- a/mayan/apps/checkouts/tests/test_models.py +++ b/mayan/apps/checkouts/tests/test_models.py @@ -8,13 +8,13 @@ from django.core.files import File from django.test import TestCase, override_settings from django.utils.timezone import now -from authentication.tests.literals import ( - TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD -) from documents.models import DocumentType from documents.tests.literals import ( TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH ) +from user_management.tests.literals import ( + TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD +) from ..exceptions import ( DocumentAlreadyCheckedOut, DocumentNotCheckedOut, diff --git a/mayan/apps/checkouts/tests/test_views.py b/mayan/apps/checkouts/tests/test_views.py index a8fe603424..519bc8bea3 100644 --- a/mayan/apps/checkouts/tests/test_views.py +++ b/mayan/apps/checkouts/tests/test_views.py @@ -12,9 +12,11 @@ from django.utils.timezone import now from common.literals import TIME_DELTA_UNIT_DAYS from documents.models import DocumentType from documents.tests.literals import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH ) +from user_management.tests.literals import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL +) from ..models import DocumentCheckout diff --git a/mayan/apps/common/tests/test_views.py b/mayan/apps/common/tests/test_views.py index ed57bce7d2..05fc85d356 100644 --- a/mayan/apps/common/tests/test_views.py +++ b/mayan/apps/common/tests/test_views.py @@ -5,7 +5,7 @@ from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase -from documents.tests.literals import ( +from user_management.tests.literals import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL ) diff --git a/mayan/apps/django_gpg/tests/literals.py b/mayan/apps/django_gpg/tests/literals.py new file mode 100644 index 0000000000..6d18beb52d --- /dev/null +++ b/mayan/apps/django_gpg/tests/literals.py @@ -0,0 +1,6 @@ +from __future__ import unicode_literals + +TEST_GPG_HOME = '/tmp/test_gpg_home' +TEST_KEY_ID = '607138F1AECC5A5CA31CB7715F3F7F75D210724D' +TEST_KEYSERVERS = ['pool.sks-keyservers.net'] +TEST_UIDS = 'Roberto Rosario' diff --git a/mayan/apps/django_gpg/tests/test_classes.py b/mayan/apps/django_gpg/tests/test_classes.py index 25587f7d54..a31618414c 100644 --- a/mayan/apps/django_gpg/tests/test_classes.py +++ b/mayan/apps/django_gpg/tests/test_classes.py @@ -7,10 +7,7 @@ from django.test import TestCase from ..api import GPG, Key from ..settings import setting_gpg_path -TEST_GPG_HOME = '/tmp/test_gpg_home' -TEST_KEY_ID = '607138F1AECC5A5CA31CB7715F3F7F75D210724D' -TEST_KEYSERVERS = ['pool.sks-keyservers.net'] -TEST_UIDS = 'Roberto Rosario' +from .literals import TEST_GPG_HOME, TEST_KEY_ID, TEST_KEYSERVERS, TEST_UIDS class DjangoGPGTestCase(TestCase): diff --git a/mayan/apps/document_states/tests/test_views.py b/mayan/apps/document_states/tests/test_views.py index 8146883f6f..fb5c86e56c 100644 --- a/mayan/apps/document_states/tests/test_views.py +++ b/mayan/apps/document_states/tests/test_views.py @@ -8,9 +8,11 @@ from django.test import TestCase from documents.models import DocumentType from documents.tests.literals import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH ) +from user_management.tests import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL +) from ..models import Workflow, WorkflowState, WorkflowTransition diff --git a/mayan/apps/documents/tests/literals.py b/mayan/apps/documents/tests/literals.py index 32f21386ba..7c7c14c2f8 100644 --- a/mayan/apps/documents/tests/literals.py +++ b/mayan/apps/documents/tests/literals.py @@ -6,7 +6,6 @@ import os from django.conf import settings __all__ = ( - 'TEST_ADMIN_EMAIL', 'TEST_ADMIN_PASSWORD', 'TEST_ADMIN_USERNAME', 'TEST_COMPRESSED_DOCUMENTS_FILENAME', 'TEST_COMPRESSED_DOCUMENT_PATH', 'TEST_DEU_DOCUMENT_FILENAME', 'TEST_DEU_DOCUMENT_PATH', 'TEST_DOCUMENT_PATH', 'TEST_HYBRID_DOCUMENT_PATH', @@ -19,17 +18,13 @@ __all__ = ( 'TEST_SMALL_DOCUMENT_FILENAME', 'TEST_SMALL_DOCUMENT_PATH', ) -# User related -TEST_ADMIN_EMAIL = 'admin@admin.com' -TEST_ADMIN_PASSWORD = 'test_admin_password' -TEST_ADMIN_USERNAME = 'test_admin' - # Filenames TEST_COMPRESSED_DOCUMENTS_FILENAME = 'compressed_documents.zip' TEST_DEU_DOCUMENT_FILENAME = 'deu_website.png' TEST_DOCUMENT_DESCRIPTION = 'test description' TEST_DOCUMENT_FILENAME = 'mayan_11_1.pdf' TEST_DOCUMENT_TYPE = 'test_document_type' +TEST_DOCUMENT_TYPE_2 = 'test document type 2' TEST_HYBRID_DOCUMENT = 'hybrid_text_and_image.pdf' TEST_MULTI_PAGE_TIFF = 'multi_page.tiff' TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME = 'I18N_title_áéíóúüñÑ.png.zip' diff --git a/mayan/apps/documents/tests/test_api.py b/mayan/apps/documents/tests/test_api.py index 738071975e..0b5b01807e 100644 --- a/mayan/apps/documents/tests/test_api.py +++ b/mayan/apps/documents/tests/test_api.py @@ -15,8 +15,11 @@ from django.test import override_settings from rest_framework import status from rest_framework.test import APITestCase +from user_management.tests.literals import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME +) + from .literals import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_DOCUMENT_FILENAME, TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_CHECKSUM, TEST_SMALL_DOCUMENT_PATH, ) diff --git a/mayan/apps/documents/tests/test_views.py b/mayan/apps/documents/tests/test_views.py index 59d12511d2..0521612230 100644 --- a/mayan/apps/documents/tests/test_views.py +++ b/mayan/apps/documents/tests/test_views.py @@ -9,23 +9,19 @@ from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase, override_settings -from authentication.tests.literals import ( - TEST_USER_EMAIL, TEST_USER_PASSWORD, TEST_USER_USERNAME -) from permissions.classes import Permission from permissions.models import Role -from permissions.tests.literals import ( - TEST_GROUP, TEST_ROLE_LABEL, TEST_USER_USERNAME +from permissions.tests.literals import TEST_ROLE_LABEL +from user_management.tests.literals import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_GROUP, + TEST_USER_EMAIL, TEST_USER_PASSWORD, TEST_USER_USERNAME ) from ..literals import DEFAULT_DELETE_PERIOD, DEFAULT_DELETE_TIME_UNIT from ..models import DeletedDocument, Document, DocumentType from ..permissions import permission_document_properties_edit -from .literals import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, - TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE -) +from .literals import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE TEST_DOCUMENT_TYPE_EDITED_LABEL = 'test document type edited label' TEST_DOCUMENT_TYPE_2_LABEL = 'test document type 2 label' diff --git a/mayan/apps/dynamic_search/tests/test_api.py b/mayan/apps/dynamic_search/tests/test_api.py index d1f937c225..193f52bd20 100644 --- a/mayan/apps/dynamic_search/tests/test_api.py +++ b/mayan/apps/dynamic_search/tests/test_api.py @@ -10,12 +10,11 @@ from django.test import override_settings from rest_framework.test import APITestCase from documents.models import DocumentType -from documents.tests import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH, +from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from user_management.tests import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME ) - @override_settings(OCR_AUTO_OCR=False) class SearchAPITestCase(APITestCase): """ diff --git a/mayan/apps/dynamic_search/tests/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py index c9c5c9d11b..f6ad8874e5 100644 --- a/mayan/apps/dynamic_search/tests/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -6,12 +6,11 @@ from django.test import TestCase from documents.models import DocumentType from documents.search import document_search -from documents.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from user_management.tests import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL ) - class DocumentSearchTestCase(TestCase): def setUp(self): self.admin_user = User.objects.create_superuser( diff --git a/mayan/apps/dynamic_search/tests/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py index d2b27ac7fa..89d2211fb2 100644 --- a/mayan/apps/dynamic_search/tests/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -8,9 +8,9 @@ from django.test.client import Client from documents.models import DocumentType from documents.search import document_search -from documents.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from user_management.tests import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL ) diff --git a/mayan/apps/folders/tests/test_api.py b/mayan/apps/folders/tests/test_api.py index 772e448406..94e60c6637 100644 --- a/mayan/apps/folders/tests/test_api.py +++ b/mayan/apps/folders/tests/test_api.py @@ -8,14 +8,14 @@ from django.test import override_settings from rest_framework.test import APITestCase from documents.models import DocumentType -from documents.tests import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH, +from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from user_management.tests.literals import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME ) from ..models import Folder -TEST_FOLDER_LABEL = 'test folder' +from .literals import TEST_FOLDER_EDITED_LABEL, TEST_FOLDER_LABEL class FolderAPITestCase(APITestCase): @@ -63,12 +63,12 @@ class FolderAPITestCase(APITestCase): self.client.put( reverse('rest_api:folder-detail', args=(folder.pk,)), - {'label': TEST_FOLDER_LABEL + ' edited'} + {'label': TEST_FOLDER_EDITED_LABEL} ) folder = Folder.objects.first() - self.assertEqual(folder.label, TEST_FOLDER_LABEL + ' edited') + self.assertEqual(folder.label, TEST_FOLDER_EDITED_LABEL) @override_settings(OCR_AUTO_OCR=False) def test_folder_add_document(self): diff --git a/mayan/apps/folders/tests/test_models.py b/mayan/apps/folders/tests/test_models.py index ed0a2ba8ad..2bf0cc5c53 100644 --- a/mayan/apps/folders/tests/test_models.py +++ b/mayan/apps/folders/tests/test_models.py @@ -4,11 +4,11 @@ from django.contrib.auth.models import User from django.core.files.base import File from django.test import TestCase -from authentication.tests.test_views import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME -) from documents.models import DocumentType from documents.tests import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE +from user_management.tests.literals import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME +) from ..models import Folder diff --git a/mayan/apps/folders/tests/test_views.py b/mayan/apps/folders/tests/test_views.py index 4c16db7707..6b5033dcbe 100644 --- a/mayan/apps/folders/tests/test_views.py +++ b/mayan/apps/folders/tests/test_views.py @@ -7,9 +7,9 @@ from django.test.client import Client from django.test import TestCase from documents.models import DocumentType -from documents.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from user_management.tests import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL ) from ..models import Folder diff --git a/mayan/apps/metadata/tests/literals.py b/mayan/apps/metadata/tests/literals.py index 4fb677c3d7..8d0bde2696 100644 --- a/mayan/apps/metadata/tests/literals.py +++ b/mayan/apps/metadata/tests/literals.py @@ -4,7 +4,6 @@ TEST_CORRECT_LOOKUP_VALUE = '1' TEST_DATE_PARSER = 'metadata.parsers.DateParser' TEST_DATE_VALIDATOR = 'metadata.validators.DateValidator' TEST_DOCUMENT_METADATA_VALUE_2 = 'test document metadata value 2' -TEST_DOCUMENT_TYPE_2 = 'test document type 2' TEST_DEFAULT_VALUE = 'test' TEST_INCORRECT_LOOKUP_VALUE = '0' TEST_INVALID_DATE = '___________' diff --git a/mayan/apps/metadata/tests/test_views.py b/mayan/apps/metadata/tests/test_views.py index 00b1f26c2c..1ebc83eee7 100644 --- a/mayan/apps/metadata/tests/test_views.py +++ b/mayan/apps/metadata/tests/test_views.py @@ -8,16 +8,18 @@ from django.test import TestCase from documents.models import DocumentType from documents.tests.literals import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH + TEST_DOCUMENT_TYPE, TEST_DOCUMENT_TYPE_2, TEST_SMALL_DOCUMENT_PATH +) +from user_management.tests.literals import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL ) from ..models import MetadataType from .literals import ( - TEST_DOCUMENT_TYPE_2, TEST_DOCUMENT_METADATA_VALUE_2, - TEST_METADATA_TYPE_LABEL, TEST_METADATA_TYPE_LABEL_2, - TEST_METADATA_TYPE_NAME, TEST_METADATA_TYPE_NAME_2 + TEST_DOCUMENT_METADATA_VALUE_2, TEST_METADATA_TYPE_LABEL, + TEST_METADATA_TYPE_LABEL_2, TEST_METADATA_TYPE_NAME, + TEST_METADATA_TYPE_NAME_2 ) diff --git a/mayan/apps/ocr/tests/test_api.py b/mayan/apps/ocr/tests/test_api.py index 578a3456a6..f71d37d0bc 100644 --- a/mayan/apps/ocr/tests/test_api.py +++ b/mayan/apps/ocr/tests/test_api.py @@ -10,9 +10,9 @@ from rest_framework import status from rest_framework.test import APITestCase from documents.models import DocumentType -from documents.tests import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH, +from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from user_management.tests import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME ) diff --git a/mayan/apps/permissions/tests/literals.py b/mayan/apps/permissions/tests/literals.py index fa85c2f898..0cb9977ae7 100644 --- a/mayan/apps/permissions/tests/literals.py +++ b/mayan/apps/permissions/tests/literals.py @@ -1,7 +1,4 @@ from __future__ import unicode_literals -TEST_GROUP = 'test group' TEST_ROLE_LABEL = 'test role' TEST_ROLE_LABEL_EDITED = 'test role label edited' -TEST_USER_USERNAME = 'test user' -TEST_USER_PASSWORD = 'test password' diff --git a/mayan/apps/permissions/tests/test_models.py b/mayan/apps/permissions/tests/test_models.py index c2fbaea6ed..2cc93d1c47 100644 --- a/mayan/apps/permissions/tests/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -5,11 +5,13 @@ from django.contrib.auth.models import Group from django.core.exceptions import PermissionDenied from django.test import TestCase +from user_management.tests import TEST_GROUP, TEST_USER_USERNAME + from ..classes import Permission from ..models import Role from ..permissions import permission_role_view -from .literals import TEST_GROUP, TEST_ROLE_LABEL, TEST_USER_USERNAME +from .literals import TEST_ROLE_LABEL class PermissionTestCase(TestCase): diff --git a/mayan/apps/permissions/tests/test_views.py b/mayan/apps/permissions/tests/test_views.py index 2583e992f8..8bcaa9bb23 100644 --- a/mayan/apps/permissions/tests/test_views.py +++ b/mayan/apps/permissions/tests/test_views.py @@ -5,7 +5,7 @@ from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase -from documents.tests.literals import ( +from user_management.tests import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL ) diff --git a/mayan/apps/sources/tests/test_models.py b/mayan/apps/sources/tests/test_models.py index deb1aa1786..d5713455b6 100644 --- a/mayan/apps/sources/tests/test_models.py +++ b/mayan/apps/sources/tests/test_models.py @@ -3,18 +3,20 @@ from __future__ import unicode_literals import shutil import tempfile -from django.contrib.auth.models import User +from django.contrib.auth import get_user_model from django.core.files.base import File from django.test import TestCase, override_settings from django.test.client import Client from documents.models import Document, DocumentType from documents.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_COMPRESSED_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_NON_ASCII_DOCUMENT_FILENAME, TEST_NON_ASCII_DOCUMENT_PATH, TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH ) +from user_management.tests import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME +) from ..literals import SOURCE_UNCOMPRESS_CHOICE_Y from ..models import WatchFolderSource, WebFormSource @@ -31,7 +33,7 @@ class UploadDocumentTestCase(TestCase): label=TEST_DOCUMENT_TYPE ) - self.admin_user = User.objects.create_superuser( + self.admin_user = get_user_model().objects.create_superuser( username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD ) diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index 646ed08f01..e0d571afdf 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -7,12 +7,15 @@ from django.test import TestCase, override_settings from documents.models import Document, DocumentType from documents.tests import ( - TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, - TEST_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_PATH, - TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE, + TEST_DOCUMENT_PATH, TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_DESCRIPTION, + TEST_DOCUMENT_TYPE ) -from sources.literals import SOURCE_CHOICE_WEB_FORM -from sources.models import WebFormSource +from user_management.tests import ( + TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL +) + +from ..literals import SOURCE_CHOICE_WEB_FORM +from ..models import WebFormSource @override_settings(OCR_AUTO_OCR=False) diff --git a/mayan/apps/tags/tests/test_api.py b/mayan/apps/tags/tests/test_api.py index bbbe399b63..c6291b5c66 100644 --- a/mayan/apps/tags/tests/test_api.py +++ b/mayan/apps/tags/tests/test_api.py @@ -8,9 +8,9 @@ from django.test import override_settings from rest_framework.test import APITestCase from documents.models import DocumentType -from documents.tests import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, - TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH +from user_management.tests.literals import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME ) from ..models import Tag diff --git a/mayan/apps/tags/tests/test_views.py b/mayan/apps/tags/tests/test_views.py index 94731d5fbe..b841cbedb2 100644 --- a/mayan/apps/tags/tests/test_views.py +++ b/mayan/apps/tags/tests/test_views.py @@ -12,8 +12,10 @@ from documents.permissions import permission_document_view from documents.tests import TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH from permissions import Permission from permissions.models import Role -from permissions.tests.literals import ( - TEST_GROUP, TEST_ROLE_LABEL, TEST_USER_PASSWORD, TEST_USER_USERNAME +from permissions.tests.literals import TEST_ROLE_LABEL +from user_management.tests import ( + TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_GROUP, + TEST_USER_PASSWORD, TEST_USER_USERNAME ) from ..models import Tag @@ -24,6 +26,11 @@ from .literals import TEST_TAG_COLOR, TEST_TAG_LABEL class TagViewTestCase(TestCase): def setUp(self): + self.admin_user = get_user_model().objects.create_superuser( + email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD, + username=TEST_ADMIN_USERNAME + ) + self.user = get_user_model().objects.create_user( username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD ) @@ -42,11 +49,6 @@ class TagViewTestCase(TestCase): self.client = Client() # Login the admin user - logged_in = self.client.login( - username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD - ) - self.assertTrue(logged_in) - self.assertTrue(self.user.is_authenticated()) self.tag = Tag.objects.create( color=TEST_TAG_COLOR, label=TEST_TAG_LABEL @@ -56,20 +58,33 @@ class TagViewTestCase(TestCase): self.group.user_set.add(self.user) self.role.groups.add(self.group) - self.role.permissions.add(permission_document_view.stored_permission) def tearDown(self): + self.admin_user.delete() + self.document_type self.group.delete() self.role.delete() self.tag.delete() self.user.delete() - self.document_type def test_document_tags_widget_no_permissions(self): + logged_in = self.client.login( + username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD + ) + self.assertTrue(logged_in) + self.assertTrue(self.user.is_authenticated()) + response = self.client.get(reverse('documents:document_list')) self.assertNotContains(response, text=TEST_TAG_LABEL, status_code=200) + # TODO: Verify this test's logic def test_document_tags_widget_with_permissions(self): + logged_in = self.client.login( + username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD + ) + self.assertTrue(logged_in) + self.assertTrue(self.user.is_authenticated()) + self.role.permissions.add(permission_tag_view.stored_permission) response = self.client.get(reverse('documents:document_list')) self.assertContains( diff --git a/mayan/apps/user_management/tests/__init__.py b/mayan/apps/user_management/tests/__init__.py new file mode 100644 index 0000000000..124ec460a6 --- /dev/null +++ b/mayan/apps/user_management/tests/__init__.py @@ -0,0 +1 @@ +from .literals import * # NOQA diff --git a/mayan/apps/user_management/tests/literals.py b/mayan/apps/user_management/tests/literals.py new file mode 100644 index 0000000000..6d91989398 --- /dev/null +++ b/mayan/apps/user_management/tests/literals.py @@ -0,0 +1,16 @@ +from __future__ import unicode_literals + +__all__ = ( + 'TEST_ADMIN_EMAIL', 'TEST_ADMIN_PASSWORD', 'TEST_ADMIN_USERNAME', + 'TEST_GROUP', 'TEST_USER_EMAIL', 'TEST_USER_PASSWORD', + 'TEST_USER_USERNAME' +) + +TEST_ADMIN_EMAIL = 'admin@example.com' +TEST_ADMIN_PASSWORD = 'test admin password' +TEST_ADMIN_USERNAME = 'test_admin' + +TEST_GROUP = 'test group' +TEST_USER_EMAIL = 'user@example.com' +TEST_USER_PASSWORD = 'test user password' +TEST_USER_USERNAME = 'test_user'