From 84b329f661b639c0c851c7fa7f62342cef2fdb02 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 24 Jul 2019 15:29:14 -0400 Subject: [PATCH] Fix more test case method resolution Signed-off-by: Roberto Rosario --- mayan/apps/authentication/tests/test_views.py | 3 +-- mayan/apps/common/tests/test_views.py | 3 +-- mayan/apps/permissions/tests/test_models.py | 6 ++++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mayan/apps/authentication/tests/test_views.py b/mayan/apps/authentication/tests/test_views.py index 8e61c9849e..db2b2b7c6e 100644 --- a/mayan/apps/authentication/tests/test_views.py +++ b/mayan/apps/authentication/tests/test_views.py @@ -14,7 +14,6 @@ from django.utils.http import urlunquote_plus from mayan.apps.common.tests import GenericViewTestCase from mayan.apps.smart_settings.classes import Namespace from mayan.apps.user_management.permissions import permission_user_edit -from mayan.apps.user_management.tests.mixins import UserTestMixin from mayan.apps.user_management.tests.literals import TEST_USER_PASSWORD_EDITED from ..settings import setting_maximum_session_length @@ -262,7 +261,7 @@ class UserLoginTestCase(GenericViewTestCase): self.assertEqual(response.redirect_chain, [(TEST_REDIRECT_URL, 302)]) -class UserViewTestCase(UserTestMixin, UserPasswordViewTestMixin, GenericViewTestCase): +class UserViewTestCase(UserPasswordViewTestMixin, GenericViewTestCase): def test_user_set_password_view_no_access(self): self._create_test_user() diff --git a/mayan/apps/common/tests/test_views.py b/mayan/apps/common/tests/test_views.py index bc13f1c3dc..9cf3b4bce0 100644 --- a/mayan/apps/common/tests/test_views.py +++ b/mayan/apps/common/tests/test_views.py @@ -4,7 +4,6 @@ from django.contrib.auth import get_user_model from django.contrib.contenttypes.models import ContentType from mayan.apps.acls.classes import ModelPermission -from mayan.apps.user_management.tests.mixins import UserTestMixin from ..models import ErrorLogEntry from ..permissions_runtime import permission_error_log_view @@ -13,7 +12,7 @@ from .base import GenericViewTestCase from .literals import TEST_ERROR_LOG_ENTRY_RESULT -class CommonViewTestCase(UserTestMixin, GenericViewTestCase): +class CommonViewTestCase(GenericViewTestCase): def _request_about_view(self): return self.get(viewname='common:about_view') diff --git a/mayan/apps/permissions/tests/test_models.py b/mayan/apps/permissions/tests/test_models.py index 74adff0788..3448cdbb15 100644 --- a/mayan/apps/permissions/tests/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied from mayan.apps.common.tests import BaseTestCase -from mayan.apps.user_management.tests.mixins import GroupTestMixin, UserTestMixin +from mayan.apps.user_management.tests.mixins import GroupTestMixin from ..classes import Permission, PermissionNamespace from ..models import StoredPermission @@ -16,7 +16,9 @@ from .literals import ( from .mixins import PermissionTestMixin, RoleTestMixin -class PermissionTestCase(GroupTestMixin, PermissionTestMixin, RoleTestMixin, UserTestMixin, BaseTestCase): +class PermissionTestCase( + GroupTestMixin, PermissionTestMixin, RoleTestMixin, BaseTestCase +): def setUp(self): super(PermissionTestCase, self).setUp() self._create_test_user()