matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix test case method resolution

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-07-24 02:58:29 -04:00
parent 3d7e6b6fbe
commit 2e12a6af41
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/user_management/tests/test_api.py
View File

@@ -107,7 +107,7 @@ class GroupAPITestCase(GroupAPITestMixin, GroupTestMixin, BaseAPITestCase):
self.assertNotEqual(self.test_group.name, group_name)
class UserAPITestCase(UserAPITestMixin, UserTestMixin, BaseAPITestCase):
class UserAPITestCase(UserAPITestMixin, BaseAPITestCase):
def test_user_create_api_view_no_permission(self):
user_count = get_user_model().objects.count()
@@ -194,7 +194,7 @@ class UserAPITestCase(UserAPITestMixin, UserTestMixin, BaseAPITestCase):
self.assertNotEqual(self.test_user.username, user_username)
class UserGroupAPITestCase(GroupTestMixin, UserAPITestMixin, UserTestMixin, BaseAPITestCase):
class UserGroupAPITestCase(GroupTestMixin, UserAPITestMixin, BaseAPITestCase):
def test_user_create_with_group_api_view_no_permission(self):
self._create_test_group()

18
mayan/apps/user_management/tests/test_events.py
View File

@@ -21,7 +21,9 @@ from .mixins import (
)
class GroupEventsViewTestCase(GroupTestMixin, GroupViewTestMixin, UserTestMixin, GenericViewTestCase):
class GroupEventsViewTestCase(
GroupTestMixin, GroupViewTestMixin, GenericViewTestCase
):
def test_group_create_event(self):
self.grant_permission(
permission=permission_group_create
@@ -53,7 +55,9 @@ class GroupEventsViewTestCase(GroupTestMixin, GroupViewTestMixin, UserTestMixin,
self.assertEqual(action.verb, event_group_edited.id)
class GroupEventsAPITestCase(GroupAPITestMixin, GroupTestMixin, GroupViewTestMixin, BaseAPITestCase):
class GroupEventsAPITestCase(
GroupAPITestMixin, GroupTestMixin, GroupViewTestMixin, BaseAPITestCase
):
def test_group_create_event_from_api_view(self):
self.grant_permission(
permission=permission_group_create
@@ -91,7 +95,7 @@ class GroupEventsAPITestCase(GroupAPITestMixin, GroupTestMixin, GroupViewTestMix
self.assertEqual(action.verb, event_group_edited.id)
class UserEventsTestCase(UserTestMixin, GenericViewTestCase):
class UserEventsTestCase(GenericViewTestCase):
auto_login_user = False
create_test_case_user = False
@@ -130,7 +134,9 @@ class UserEventsTestCase(UserTestMixin, GenericViewTestCase):
self.assertEqual(action.verb, event_user_logged_out.id)
class UserEventsViewTestCase(UserAPITestMixin, UserTestMixin, UserViewTestMixin, GenericViewTestCase):
class UserEventsViewTestCase(
UserAPITestMixin, UserViewTestMixin, GenericViewTestCase
):
def test_user_create_event_from_view(self):
self.grant_permission(
permission=permission_user_create
@@ -164,7 +170,9 @@ class UserEventsViewTestCase(UserAPITestMixin, UserTestMixin, UserViewTestMixin,
self.assertEqual(action.verb, event_user_edited.id)
class UserEventsAPITestCase(UserAPITestMixin, UserTestMixin, UserViewTestMixin, BaseAPITestCase):
class UserEventsAPITestCase(
UserAPITestMixin, UserViewTestMixin, BaseAPITestCase
):
def test_user_create_event_from_api_view(self):
self.grant_permission(
permission=permission_user_create

10
mayan/apps/user_management/tests/test_views.py
View File

@@ -19,7 +19,7 @@ from .mixins import (
)
class GroupViewsTestCase(GroupTestMixin, GroupViewTestMixin, UserTestMixin, GenericViewTestCase):
class GroupViewsTestCase(GroupTestMixin, GroupViewTestMixin, GenericViewTestCase):
def test_group_create_view_no_permission(self):
group_count = Group.objects.count()
@@ -158,7 +158,7 @@ class GroupViewsTestCase(GroupTestMixin, GroupViewTestMixin, UserTestMixin, Gene
)
class SuperUserViewTestCase(UserTestMixin, UserViewTestMixin, GenericViewTestCase):
class SuperUserViewTestCase(UserViewTestMixin, GenericViewTestCase):
def setUp(self):
super(SuperUserViewTestCase, self).setUp()
self._create_test_superuser()
@@ -199,7 +199,7 @@ class SuperUserViewTestCase(UserTestMixin, UserViewTestMixin, GenericViewTestCas
self.assertEqual(response.status_code, 404)
class UserViewTestCase(UserTestMixin, UserViewTestMixin, GenericViewTestCase):
class UserViewTestCase(UserViewTestMixin, GenericViewTestCase):
def test_user_create_view_no_permission(self):
user_count = get_user_model().objects.count()
@@ -263,7 +263,9 @@ class UserViewTestCase(UserTestMixin, UserViewTestMixin, GenericViewTestCase):
self.assertEqual(get_user_model().objects.count(), user_count - 1)
class UserGroupViewTestCase(GroupTestMixin, UserTestMixin, UserViewTestMixin, GenericViewTestCase):
class UserGroupViewTestCase(
GroupTestMixin, UserViewTestMixin, GenericViewTestCase
):
def test_user_groups_view_no_permission(self):
self._create_test_user()
self._create_test_group()