Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-16 07:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "More test fixes."

Browse Source 
This reverts commit 6c3650d9f2d4be92cc54f24cb431df8b0ee8bab1.
This commit is contained in:
colcrunch 2021-07-13 11:34:19 -04:00
parent 122e389c38
commit 489a8456f7
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
allianceauth/authentication/tests/test_backend.py
View File

@ -23,8 +23,8 @@ class TestStatePermissions(TestCase):
self.permission_2 = AuthUtils.get_permission_by_name(PERMISSION_2) self.permission_2 = AuthUtils.get_permission_by_name(PERMISSION_2)
# group # group
self.group_1 = AuthUtils.create_group(group_name="Group 1") self.group_1 = Group.objects.create(name="Group 1")
self.group_2 = AuthUtils.create_group(group_name="Group 2") self.group_2 = Group.objects.create(name="Group 2")
# state # state
self.state_1 = AuthUtils.get_member_state() self.state_1 = AuthUtils.get_member_state()

2
allianceauth/groupmanagement/tests/test_signals.py
View File

@ -53,7 +53,7 @@ class TestCheckGroupsOnStateChange(TestCase):
autogroup_config.states.add(self.test_state_1) autogroup_config.states.add(self.test_state_1)
autogroup_config.states.add(self.guest_state) autogroup_config.states.add(self.guest_state)
auto_group = autogroup_config.corp_managed_groups.first() auto_group = autogroup_config.corp_managed_groups.first()
internal_state_group = AuthUtils.create_group(group_name='internal_state_group') internal_state_group = Group.objects.create(name='internal_state_group')
internal_state_group.authgroup.states.add(self.test_state_1) internal_state_group.authgroup.states.add(self.test_state_1)
self.test_state_1.member_corporations.add(self.corp_1) self.test_state_1.member_corporations.add(self.corp_1)
self.user.groups.add(normal_group) self.user.groups.add(normal_group)

4
allianceauth/permissions_tool/tests.py
View File

@ -18,9 +18,9 @@ class PermissionsToolViewsTestCase(WebTest):
self.no_perm_user = AuthUtils.create_user('no_perm_user', disconnect_signals=True) self.no_perm_user = AuthUtils.create_user('no_perm_user', disconnect_signals=True)
AuthUtils.disconnect_signals() AuthUtils.disconnect_signals()
self.no_perm_group = AuthUtils.create_group(group_name="No Permission Group") self.no_perm_group = Group.objects.create(name="No Permission Group")
self.test_group = AuthUtils.create_group(group_name="Test group") self.test_group = Group.objects.create(name="Test group")
self.test_group.user_set.add(self.none_user) self.test_group.user_set.add(self.none_user)
self.test_group.user_set.add(self.none_user2) self.test_group.user_set.add(self.none_user2)

2
allianceauth/services/modules/discord/tests/test_integration.py
View File

@ -119,7 +119,7 @@ class TestServiceFeatures(TransactionTestCase):
""" """
clear_cache() clear_cache()
reset_testdata() reset_testdata()
self.group_charlie = AuthUtils.create_group(group_name='charlie') self.group_charlie = Group.objects.create(name='charlie')
# States # States
self.member_state = AuthUtils.get_member_state() self.member_state = AuthUtils.get_member_state()

8
allianceauth/services/modules/discord/tests/test_managers.py
View File

@ -413,8 +413,8 @@ class TestUserGroupNames(TestCase):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
super().setUpClass() super().setUpClass()
cls.group_1 = AuthUtils.create_group(group_name='Group 1') cls.group_1 = Group.objects.create(name='Group 1')
cls.group_2 = AuthUtils.create_group(group_name='Group 2') cls.group_2 = Group.objects.create(name='Group 2')
def setUp(self): def setUp(self):
self.user = AuthUtils.create_member(TEST_USER_NAME) self.user = AuthUtils.create_member(TEST_USER_NAME)
@ -501,11 +501,11 @@ class TestRoleForGroup(TestCase):
def test_return_role_if_found(self, mock_DiscordClient): def test_return_role_if_found(self, mock_DiscordClient):
mock_DiscordClient.return_value.match_role_from_name.return_value = ROLE_ALPHA mock_DiscordClient.return_value.match_role_from_name.return_value = ROLE_ALPHA
group = AuthUtils.create_group(group_name='alpha') group = Group.objects.create(name='alpha')
self.assertEqual(DiscordUser.objects.group_to_role(group), ROLE_ALPHA) self.assertEqual(DiscordUser.objects.group_to_role(group), ROLE_ALPHA)
def test_return_empty_dict_if_not_found(self, mock_DiscordClient): def test_return_empty_dict_if_not_found(self, mock_DiscordClient):
mock_DiscordClient.return_value.match_role_from_name.return_value = dict() mock_DiscordClient.return_value.match_role_from_name.return_value = dict()
group = AuthUtils.create_group(group_name='unknown') group = Group.objects.create(name='unknown')
self.assertEqual(DiscordUser.objects.group_to_role(group), dict()) self.assertEqual(DiscordUser.objects.group_to_role(group), dict())