diff --git a/mayan/apps/smart_settings/tests/test_classes.py b/mayan/apps/smart_settings/tests/test_classes.py index 1b655b2263..b7fd07d085 100644 --- a/mayan/apps/smart_settings/tests/test_classes.py +++ b/mayan/apps/smart_settings/tests/test_classes.py @@ -7,7 +7,6 @@ from django.utils.encoding import force_text from mayan.apps.common.settings import setting_paginate_by from mayan.apps.common.tests.base import BaseTestCase -from mayan.apps.common.tests.mixins import EnvironmentTestCaseMixin from mayan.apps.storage.utils import fs_cleanup from ..classes import Setting @@ -23,9 +22,7 @@ from .mocks import ( ) -class ClassesTestCase( - EnvironmentTestCaseMixin, SmartSettingTestMixin, BaseTestCase -): +class ClassesTestCase(SmartSettingTestMixin, BaseTestCase): def test_environment_override(self): test_environment_value = 'test environment value' test_file_value = 'test file value' @@ -84,9 +81,7 @@ class ClassesTestCase( self.assertTrue(Setting.check_changed()) -class NamespaceMigrationTestCase( - EnvironmentTestCaseMixin, SmartSettingTestMixin, BaseTestCase -): +class NamespaceMigrationTestCase(SmartSettingTestMixin, BaseTestCase): def test_environment_migration(self): self._set_environment_variable( name='MAYAN_{}'.format(TEST_SETTING_GLOBAL_NAME), diff --git a/mayan/apps/smart_settings/tests/test_utils.py b/mayan/apps/smart_settings/tests/test_utils.py index 6c996bf267..65a89a088a 100644 --- a/mayan/apps/smart_settings/tests/test_utils.py +++ b/mayan/apps/smart_settings/tests/test_utils.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, unicode_literals from mayan.apps.common.tests.base import BaseTestCase -from mayan.apps.common.tests.mixins import EnvironmentTestCaseMixin from .literals import ( TEST_BOOTSTAP_SETTING_NAME, TEST_SETTING_VALUE, @@ -11,8 +10,7 @@ from .mixins import BoostrapSettingTestMixin, SmartSettingTestMixin class BoostrapSettingTestCase( - BoostrapSettingTestMixin, EnvironmentTestCaseMixin, - SmartSettingTestMixin, BaseTestCase + BoostrapSettingTestMixin, SmartSettingTestMixin, BaseTestCase ): def setUp(self): super(BoostrapSettingTestCase, self).setUp() diff --git a/mayan/apps/web_links/tests/mixins.py b/mayan/apps/web_links/tests/mixins.py index 59539f7de5..ebfed9fdf2 100644 --- a/mayan/apps/web_links/tests/mixins.py +++ b/mayan/apps/web_links/tests/mixins.py @@ -34,7 +34,7 @@ class WebLinkViewTestMixin(object): return self.post( viewname='web_links:web_link_create', data={ 'label': TEST_WEB_LINK_LABEL, - 'template': TEST_WEB_LINK_TEMPLATE + 'template_template': TEST_WEB_LINK_TEMPLATE, } ) @@ -51,7 +51,7 @@ class WebLinkViewTestMixin(object): 'pk': self.test_web_link.pk }, data={ 'label': TEST_WEB_LINK_LABEL_EDITED, - 'template': TEST_WEB_LINK_TEMPLATE + 'template_template': TEST_WEB_LINK_TEMPLATE } )