diff --git a/mayan/apps/acls/tests/__init__.py b/mayan/apps/acls/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/acls/test_models.py b/mayan/apps/acls/tests/test_models.py similarity index 98% rename from mayan/apps/acls/test_models.py rename to mayan/apps/acls/tests/test_models.py index 5a5c7acbfd..ec5b21296a 100644 --- a/mayan/apps/acls/test_models.py +++ b/mayan/apps/acls/tests/test_models.py @@ -8,11 +8,11 @@ from django.test import TestCase from documents.models import Document, DocumentType from documents.permissions import permission_document_view -from documents.test_models import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE +from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE from permissions.classes import Permission from permissions.models import Role -from .models import AccessControlList +from ..models import AccessControlList class PermissionTestCase(TestCase): diff --git a/mayan/apps/appearance/templates/appearance/base.html b/mayan/apps/appearance/templates/appearance/base.html index 23f1eccab3..e54a8bbded 100644 --- a/mayan/apps/appearance/templates/appearance/base.html +++ b/mayan/apps/appearance/templates/appearance/base.html @@ -1,5 +1,6 @@ {% load i18n %} {% load static %} +{% load tz %} {% load compress %} @@ -163,6 +164,8 @@ {% endcompress %} + {% localtime on %} + {% if appearance_type == 'plain' %} {% block content_plain %}{% endblock %} {% else %} @@ -413,5 +416,6 @@ {% block javascript %}{% endblock %} {% endcompress %} + {% endlocaltime %} diff --git a/mayan/apps/authentication/tests/__init__.py b/mayan/apps/authentication/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/authentication/test_views.py b/mayan/apps/authentication/tests/test_views.py similarity index 98% rename from mayan/apps/authentication/test_views.py rename to mayan/apps/authentication/tests/test_views.py index 150f275d6a..fea9faba5c 100644 --- a/mayan/apps/authentication/test_views.py +++ b/mayan/apps/authentication/tests/test_views.py @@ -6,7 +6,7 @@ from django.core.urlresolvers import reverse from django.test import TestCase from django.test.client import Client -from .settings import setting_login_method +from ..settings import setting_login_method TEST_ADMIN_EMAIL = 'admin@admin.com' TEST_ADMIN_PASSWORD = 'test_admin_password' diff --git a/mayan/apps/django_gpg/tests/__init__.py b/mayan/apps/django_gpg/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/django_gpg/tests.py b/mayan/apps/django_gpg/tests/test_classes.py similarity index 94% rename from mayan/apps/django_gpg/tests.py rename to mayan/apps/django_gpg/tests/test_classes.py index 2359b6a42d..fc500a0544 100644 --- a/mayan/apps/django_gpg/tests.py +++ b/mayan/apps/django_gpg/tests/test_classes.py @@ -4,13 +4,13 @@ import shutil from django.test import TestCase -from .api import GPG, Key -from .settings import setting_gpg_path +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' -TEST_KEY_ID = '607138F1AECC5A5CA31CB7715F3F7F75D210724D' class DjangoGPGTestCase(TestCase): diff --git a/mayan/apps/document_indexing/tests/__init__.py b/mayan/apps/document_indexing/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/document_indexing/test_models.py b/mayan/apps/document_indexing/tests/test_models.py similarity index 97% rename from mayan/apps/document_indexing/test_models.py rename to mayan/apps/document_indexing/tests/test_models.py index 72da641b9d..fb66dd5567 100644 --- a/mayan/apps/document_indexing/test_models.py +++ b/mayan/apps/document_indexing/tests/test_models.py @@ -4,10 +4,10 @@ from django.core.files.base import File from django.test import TestCase from documents.models import DocumentType -from documents.test_models import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE +from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE from metadata.models import MetadataType, DocumentTypeMetadataType -from .models import Index, IndexInstanceNode, IndexTemplateNode +from ..models import Index, IndexInstanceNode, IndexTemplateNode class IndexTestCase(TestCase): diff --git a/mayan/apps/document_signatures/tests/__init__.py b/mayan/apps/document_signatures/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/document_signatures/test_models.py b/mayan/apps/document_signatures/tests/test_models.py similarity index 96% rename from mayan/apps/document_signatures/test_models.py rename to mayan/apps/document_signatures/tests/test_models.py index 9646d4271d..1d1878b3b0 100644 --- a/mayan/apps/document_signatures/test_models.py +++ b/mayan/apps/document_signatures/tests/test_models.py @@ -7,11 +7,11 @@ from django.core.files.base import File from django.test import TestCase from documents.models import DocumentType -from documents.test_models import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE +from documents.tests import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE from django_gpg.literals import SIGNATURE_STATE_VALID from django_gpg.runtime import gpg -from .models import DocumentVersionSignature +from ..models import DocumentVersionSignature TEST_SIGNED_DOCUMENT_PATH = os.path.join( settings.BASE_DIR, 'contrib', 'sample_documents', 'mayan_11_1.pdf.gpg' diff --git a/mayan/apps/documents/tests/__init__.py b/mayan/apps/documents/tests/__init__.py new file mode 100644 index 0000000000..f2e13ca4d2 --- /dev/null +++ b/mayan/apps/documents/tests/__init__.py @@ -0,0 +1 @@ +from .literals import * diff --git a/mayan/apps/documents/tests/literals.py b/mayan/apps/documents/tests/literals.py new file mode 100644 index 0000000000..832222aba5 --- /dev/null +++ b/mayan/apps/documents/tests/literals.py @@ -0,0 +1,69 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +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', + 'TEST_DOCUMENT_FILENAME', 'TEST_DOCUMENT_TYPE', + 'TEST_DOCUMENT_DESCRIPTION', 'TEST_HYBRID_DOCUMENT', + 'TEST_MULTI_PAGE_TIFF', 'TEST_MULTI_PAGE_TIFF_PATH', + 'TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME', + 'TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH', + 'TEST_NON_ASCII_DOCUMENT_FILENAME', 'TEST_NON_ASCII_DOCUMENT_PATH', + '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_HYBRID_DOCUMENT = 'hybrid_text_and_image.pdf' +TEST_MULTI_PAGE_TIFF = 'multi_page.tiff' +TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME = 'I18N_title_áéíóúüñÑ.png.zip' +TEST_NON_ASCII_DOCUMENT_FILENAME = 'I18N_title_áéíóúüñÑ.png' +TEST_SMALL_DOCUMENT_FILENAME = 'title_page.png' + +# File paths +TEST_COMPRESSED_DOCUMENT_PATH = os.path.join( + settings.BASE_DIR, 'contrib', 'sample_documents', + TEST_COMPRESSED_DOCUMENTS_FILENAME +) +TEST_DEU_DOCUMENT_PATH = os.path.join( + settings.BASE_DIR, 'contrib', 'sample_documents', + TEST_DEU_DOCUMENT_FILENAME +) +TEST_DOCUMENT_PATH = os.path.join( + settings.BASE_DIR, 'contrib', 'sample_documents', TEST_DOCUMENT_FILENAME +) +TEST_HYBRID_DOCUMENT_PATH = os.path.join( + 'contrib', 'sample_documents', TEST_HYBRID_DOCUMENT +) +TEST_MULTI_PAGE_TIFF_PATH = os.path.join( + settings.BASE_DIR, 'contrib', 'sample_documents', + TEST_MULTI_PAGE_TIFF +) +TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH = os.path.join( + settings.BASE_DIR, 'contrib', 'sample_documents', + TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME +) +TEST_NON_ASCII_DOCUMENT_PATH = os.path.join( + settings.BASE_DIR, 'contrib', 'sample_documents', + TEST_NON_ASCII_DOCUMENT_FILENAME +) +TEST_SMALL_DOCUMENT_PATH = os.path.join( + settings.BASE_DIR, 'contrib', 'sample_documents', + TEST_SMALL_DOCUMENT_FILENAME +) diff --git a/mayan/apps/documents/test_api.py b/mayan/apps/documents/tests/test_api.py similarity index 99% rename from mayan/apps/documents/test_api.py rename to mayan/apps/documents/tests/test_api.py index 059af0170e..19dfe52703 100644 --- a/mayan/apps/documents/test_api.py +++ b/mayan/apps/documents/tests/test_api.py @@ -11,12 +11,12 @@ from django.core.urlresolvers import reverse from rest_framework import status from rest_framework.test import APITestCase -from .models import Document, DocumentType -from .test_models import ( +from .literals import ( TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_DOCUMENT_FILENAME, TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH, ) +from ..models import Document, DocumentType class DocumentTypeAPITestCase(APITestCase): diff --git a/mayan/apps/documents/test_models.py b/mayan/apps/documents/tests/test_models.py similarity index 66% rename from mayan/apps/documents/test_models.py rename to mayan/apps/documents/tests/test_models.py index b5839b4f3f..1651631765 100644 --- a/mayan/apps/documents/test_models.py +++ b/mayan/apps/documents/tests/test_models.py @@ -1,57 +1,14 @@ -# -*- coding: utf-8 -*- from __future__ import unicode_literals -import os - from django.conf import settings from django.core.files import File from django.test import TestCase -from .models import DeletedDocument, Document, DocumentType - -TEST_ADMIN_PASSWORD = 'test_admin_password' -TEST_ADMIN_USERNAME = 'test_admin' -TEST_ADMIN_EMAIL = 'admin@admin.com' -TEST_DEU_DOCUMENT_FILENAME = 'deu_website.png' -TEST_COMPRESSED_DOCUMENTS_FILENAME = 'compressed_documents.zip' -TEST_SMALL_DOCUMENT_FILENAME = 'title_page.png' -TEST_MULTI_PAGE_TIFF = 'multi_page.tiff' -TEST_NON_ASCII_DOCUMENT_FILENAME = 'I18N_title_áéíóúüñÑ.png' -TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME = 'I18N_title_áéíóúüñÑ.png.zip' -TEST_DOCUMENT_FILENAME = 'mayan_11_1.pdf' -TEST_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', TEST_DOCUMENT_FILENAME -) -TEST_SMALL_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_SMALL_DOCUMENT_FILENAME -) -TEST_MULTI_PAGE_TIFF_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_MULTI_PAGE_TIFF -) -TEST_NON_ASCII_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_NON_ASCII_DOCUMENT_FILENAME -) -TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_NON_ASCII_COMPRESSED_DOCUMENT_FILENAME -) -TEST_DEU_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_DEU_DOCUMENT_FILENAME -) -TEST_COMPRESSED_DOCUMENT_PATH = os.path.join( - settings.BASE_DIR, 'contrib', 'sample_documents', - TEST_COMPRESSED_DOCUMENTS_FILENAME -) -TEST_DOCUMENT_DESCRIPTION = 'test description' -TEST_DOCUMENT_TYPE = 'test_document_type' -TEST_HYBRID_DOCUMENT = 'hybrid_text_and_image.pdf' -TEST_HYBRID_DOCUMENT_PATH = os.path.join( - 'contrib', 'sample_documents', TEST_HYBRID_DOCUMENT +from .literals import ( + TEST_DOCUMENT_TYPE, TEST_DOCUMENT_PATH, TEST_MULTI_PAGE_TIFF_PATH, + TEST_SMALL_DOCUMENT_PATH ) +from ..models import DeletedDocument, Document, DocumentType class DocumentTestCase(TestCase): diff --git a/mayan/apps/documents/test_views.py b/mayan/apps/documents/tests/test_views.py similarity index 98% rename from mayan/apps/documents/test_views.py rename to mayan/apps/documents/tests/test_views.py index 8e66b52a7d..2691a0e3fd 100644 --- a/mayan/apps/documents/test_views.py +++ b/mayan/apps/documents/tests/test_views.py @@ -8,11 +8,11 @@ from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase -from .models import DeletedDocument, Document, DocumentType -from .test_models import ( +from .literals import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE ) +from ..models import DeletedDocument, Document, DocumentType class DocumentsViewsFunctionalTestCase(TestCase): diff --git a/mayan/apps/dynamic_search/tests/__init__.py b/mayan/apps/dynamic_search/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/dynamic_search/test_api.py b/mayan/apps/dynamic_search/tests/test_api.py similarity index 97% rename from mayan/apps/dynamic_search/test_api.py rename to mayan/apps/dynamic_search/tests/test_api.py index 0d8f34c469..e3fd59abb5 100644 --- a/mayan/apps/dynamic_search/test_api.py +++ b/mayan/apps/dynamic_search/tests/test_api.py @@ -9,7 +9,7 @@ from django.core.urlresolvers import reverse from rest_framework.test import APITestCase from documents.models import DocumentType -from documents.test_models import ( +from documents.tests import ( TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH, ) diff --git a/mayan/apps/dynamic_search/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py similarity index 98% rename from mayan/apps/dynamic_search/test_models.py rename to mayan/apps/dynamic_search/tests/test_models.py index 7ffe963d93..c9c5c9d11b 100644 --- a/mayan/apps/dynamic_search/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -6,7 +6,7 @@ from django.test import TestCase from documents.models import DocumentType from documents.search import document_search -from documents.test_models import ( +from documents.tests import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH ) diff --git a/mayan/apps/dynamic_search/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py similarity index 93% rename from mayan/apps/dynamic_search/test_views.py rename to mayan/apps/dynamic_search/tests/test_views.py index a97e998060..7daf87de8c 100644 --- a/mayan/apps/dynamic_search/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -6,11 +6,9 @@ from django.core.urlresolvers import reverse from django.test import TestCase from django.test.client import Client -from pagination.templatetags import pagination_tags - from documents.models import DocumentType from documents.search import document_search -from documents.test_models import ( +from documents.tests import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH ) @@ -61,9 +59,7 @@ class Issue46TestCase(TestCase): ) self.assertEqual(len(result_set), self.document_count) - with self.settings(PAGINATION_DEFAULT_PAGINATION=2): - reload(pagination_tags) - + with self.settings(COMMON_PAGINATE_BY=2): # Funcitonal test for the first page of advanced results response = self.client.get( reverse('search:results'), {'label': 'test'} diff --git a/mayan/apps/folders/tests/__init__.py b/mayan/apps/folders/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/folders/test_api.py b/mayan/apps/folders/tests/test_api.py similarity index 98% rename from mayan/apps/folders/test_api.py rename to mayan/apps/folders/tests/test_api.py index 7a0305cb44..92ef991f1d 100644 --- a/mayan/apps/folders/test_api.py +++ b/mayan/apps/folders/tests/test_api.py @@ -7,12 +7,12 @@ from django.core.urlresolvers import reverse from rest_framework.test import APITestCase from documents.models import DocumentType -from documents.test_models import ( +from documents.tests import ( TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH, ) -from .models import Folder +from ..models import Folder TEST_FOLDER_LABEL = 'test folder' diff --git a/mayan/apps/folders/test_models.py b/mayan/apps/folders/tests/test_models.py similarity index 93% rename from mayan/apps/folders/test_models.py rename to mayan/apps/folders/tests/test_models.py index 9e45f8b13f..ed0a2ba8ad 100644 --- a/mayan/apps/folders/test_models.py +++ b/mayan/apps/folders/tests/test_models.py @@ -4,13 +4,13 @@ from django.contrib.auth.models import User from django.core.files.base import File from django.test import TestCase -from authentication.test_views import ( +from authentication.tests.test_views import ( TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME ) from documents.models import DocumentType -from documents.test_models import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE +from documents.tests import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE -from .models import Folder +from ..models import Folder class FolderTestCase(TestCase): diff --git a/mayan/apps/lock_manager/tests/__init__.py b/mayan/apps/lock_manager/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/lock_manager/test_models.py b/mayan/apps/lock_manager/tests/test_models.py similarity index 96% rename from mayan/apps/lock_manager/test_models.py rename to mayan/apps/lock_manager/tests/test_models.py index 1700018683..a915c7af60 100644 --- a/mayan/apps/lock_manager/test_models.py +++ b/mayan/apps/lock_manager/tests/test_models.py @@ -4,8 +4,8 @@ import time from django.test import TestCase -from .exceptions import LockError -from .models import Lock +from ..exceptions import LockError +from ..models import Lock class LockTestCase(TestCase): diff --git a/mayan/apps/ocr/tests/__init__.py b/mayan/apps/ocr/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/ocr/test_models.py b/mayan/apps/ocr/tests/test_models.py similarity index 98% rename from mayan/apps/ocr/test_models.py rename to mayan/apps/ocr/tests/test_models.py index 14525af663..12a13bc7fc 100644 --- a/mayan/apps/ocr/test_models.py +++ b/mayan/apps/ocr/tests/test_models.py @@ -7,7 +7,7 @@ from django.test import TestCase from documents.models import DocumentType from documents.settings import setting_language_choices -from documents.test_models import ( +from documents.tests import ( TEST_DEU_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH ) diff --git a/mayan/apps/ocr/test_parsers.py b/mayan/apps/ocr/tests/test_parsers.py similarity index 95% rename from mayan/apps/ocr/test_parsers.py rename to mayan/apps/ocr/tests/test_parsers.py index 813ac339dd..5bc84fac63 100644 --- a/mayan/apps/ocr/test_parsers.py +++ b/mayan/apps/ocr/tests/test_parsers.py @@ -4,12 +4,12 @@ from django.core.files.base import File from django.test import TestCase from documents.models import DocumentType -from documents.test_models import ( +from documents.tests import ( TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE, TEST_HYBRID_DOCUMENT_PATH ) -from .classes import TextExtractor -from .parsers import PDFMinerParser, PopplerParser +from ..classes import TextExtractor +from ..parsers import PDFMinerParser, PopplerParser class ParserTestCase(TestCase): diff --git a/mayan/apps/permissions/tests/__init__.py b/mayan/apps/permissions/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/permissions/test_models.py b/mayan/apps/permissions/tests/test_models.py similarity index 92% rename from mayan/apps/permissions/test_models.py rename to mayan/apps/permissions/tests/test_models.py index 7b6edbe07d..7f37c39b55 100644 --- a/mayan/apps/permissions/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -5,9 +5,9 @@ from django.contrib.auth.models import Group from django.core.exceptions import PermissionDenied from django.test import TestCase -from .classes import Permission -from .models import Role -from .permissions import permission_role_view +from ..classes import Permission +from ..models import Role +from ..permissions import permission_role_view class PermissionTestCase(TestCase): diff --git a/mayan/apps/sources/tests/__init__.py b/mayan/apps/sources/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/sources/test_models.py b/mayan/apps/sources/tests/test_models.py similarity index 96% rename from mayan/apps/sources/test_models.py rename to mayan/apps/sources/tests/test_models.py index bf8f73b087..9e72c1c93b 100644 --- a/mayan/apps/sources/test_models.py +++ b/mayan/apps/sources/tests/test_models.py @@ -9,16 +9,15 @@ from django.test import TestCase from django.test.client import Client from documents.models import Document, DocumentType - -from documents.test_models import ( +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 .literals import SOURCE_UNCOMPRESS_CHOICE_Y -from .models import WatchFolderSource, WebFormSource +from ..literals import SOURCE_UNCOMPRESS_CHOICE_Y +from ..models import WatchFolderSource, WebFormSource class UploadDocumentTestCase(TestCase): diff --git a/mayan/apps/sources/test_views.py b/mayan/apps/sources/tests/test_views.py similarity index 99% rename from mayan/apps/sources/test_views.py rename to mayan/apps/sources/tests/test_views.py index f828e7fd7d..2c7626a803 100644 --- a/mayan/apps/sources/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -6,14 +6,13 @@ from django.test.client import Client from django.test import TestCase from documents.models import Document, DocumentType -from sources.literals import SOURCE_CHOICE_WEB_FORM -from sources.models import WebFormSource - -from documents.test_models import ( +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, ) +from sources.literals import SOURCE_CHOICE_WEB_FORM +from sources.models import WebFormSource class UploadDocumentTestCase(TestCase): diff --git a/mayan/apps/tags/tests/__init__.py b/mayan/apps/tags/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/mayan/apps/tags/test_api.py b/mayan/apps/tags/tests/test_api.py similarity index 98% rename from mayan/apps/tags/test_api.py rename to mayan/apps/tags/tests/test_api.py index e18e3369e3..f0aef0ae41 100644 --- a/mayan/apps/tags/test_api.py +++ b/mayan/apps/tags/tests/test_api.py @@ -7,12 +7,12 @@ from django.core.urlresolvers import reverse from rest_framework.test import APITestCase from documents.models import DocumentType -from documents.test_models import ( +from documents.tests import ( TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_DOCUMENT_TYPE, TEST_SMALL_DOCUMENT_PATH, ) -from .models import Tag +from ..models import Tag TEST_TAG_LABEL = 'test tag' TEST_TAG_LABEL_ALTERNATE = 'test tag alternate' diff --git a/mayan/apps/tags/test_models.py b/mayan/apps/tags/tests/test_models.py similarity index 93% rename from mayan/apps/tags/test_models.py rename to mayan/apps/tags/tests/test_models.py index 59fd510b95..84b886c1a8 100644 --- a/mayan/apps/tags/test_models.py +++ b/mayan/apps/tags/tests/test_models.py @@ -4,9 +4,9 @@ from django.core.files.base import File from django.test import TestCase from documents.models import DocumentType -from documents.test_models import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE +from documents.tests import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE -from .models import Tag +from ..models import Tag TAG_COLOR = '#FF0000'