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

Revert "Update tests to use the create_group util."

Browse Source 
This reverts commit 0897383e41bf401f9f7855b2b510cedcdd204de6.
This commit is contained in:
colcrunch 2021-07-13 11:34:46 -04:00
parent ad92ea243d
commit b8b8e470f2
7 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
allianceauth/groupmanagement/tests/test_admin.py
View File

@ -10,7 +10,6 @@ from allianceauth.authentication.models import CharacterOwnership, State
from allianceauth.eveonline.models import (
EveCharacter, EveCorporationInfo, EveAllianceInfo
)
from allianceauth.tests.auth_utils import AuthUtils
from ..admin import HasLeaderFilter, GroupAdmin, Group, AuthGroup
from . import get_admin_change_view_url
@ -47,20 +46,23 @@ class TestGroupAdmin(TestCase):
cls.group_1.authgroup.save()
# group 2 - no leader
cls.group_2 = AuthUtils.create_group(group_name='Group 2')
cls.group_2 = Group.objects.create(name='Group 2')
AuthGroup.objects.create(group=cls.group_2)
cls.group_2.authgroup.description = 'Internal Group'
cls.group_2.authgroup.internal = True
cls.group_2.authgroup.save()
# group 3 - has leader
cls.group_3 = AuthUtils.create_group(group_name='Group 3')
cls.group_3 = Group.objects.create(name='Group 3')
AuthGroup.objects.create(group=cls.group_3)
cls.group_3.authgroup.description = 'Hidden Group'
cls.group_3.authgroup.internal = False
cls.group_3.authgroup.hidden = True
cls.group_3.authgroup.save()
# group 4 - no leader
cls.group_4 = AuthUtils.create_group(group_name='Group 4')
cls.group_4 = Group.objects.create(name='Group 4')
AuthGroup.objects.create(group=cls.group_4)
cls.group_4.authgroup.description = 'Open Group'
cls.group_4.authgroup.internal = False
cls.group_4.authgroup.hidden = False
@ -68,7 +70,8 @@ class TestGroupAdmin(TestCase):
cls.group_4.authgroup.save()
# group 5 - no leader
cls.group_5 = AuthUtils.create_group(group_name='Group 5')
cls.group_5 = Group.objects.create(name='Group 5')
AuthGroup.objects.create(group=cls.group_5)
cls.group_5.authgroup.description = 'Public Group'
cls.group_5.authgroup.internal = False
cls.group_5.authgroup.hidden = False
@ -76,7 +79,8 @@ class TestGroupAdmin(TestCase):
cls.group_5.authgroup.save()
# group 6 - no leader
cls.group_6 = AuthUtils.create_group(group_name='Group 6')
cls.group_6 = Group.objects.create(name='Group 6')
AuthGroup.objects.create(group=cls.group_6)
cls.group_6.authgroup.description = 'Mixed Group'
cls.group_6.authgroup.internal = False
cls.group_6.authgroup.hidden = True

36
allianceauth/groupmanagement/tests/test_managers.py
View File

@ -28,9 +28,12 @@ class GroupManagementVisibilityTestCase(TestCase):
cls.corp = EveCorporationInfo.objects.create(
corporation_id='2', corporation_name='test corp', corporation_ticker='TEST', alliance=cls.alliance, member_count=1
)
cls.group1 = AuthUtils.create_group(group_name='group1')
cls.group2 = AuthUtils.create_group(group_name='group2')
cls.group3 = AuthUtils.create_group(group_name='group3')
cls.group1 = Group.objects.create(name='group1')
AuthGroup.objects.create(group=cls.group1)
cls.group2 = Group.objects.create(name='group2')
AuthGroup.objects.create(group=cls.group2)
cls.group3 = Group.objects.create(name='group3')
AuthGroup.objects.create(group=cls.group3)
def setUp(self):
self.user.refresh_from_db()
@ -77,27 +80,31 @@ class TestGroupManager(TestCase):
super().setUpClass()
# group 1
cls.group_default = AuthUtils.create_group(group_name='default')
cls.group_default = Group.objects.create(name='default')
AuthGroup.objects.create(group=cls.group_default)
cls.group_default.authgroup.description = 'Default Group'
cls.group_default.authgroup.internal = False
cls.group_default.authgroup.hidden = False
cls.group_default.authgroup.save()
# group 2
cls.group_internal = AuthUtils.create_group(group_name='internal')
cls.group_internal = Group.objects.create(name='internal')
AuthGroup.objects.create(group=cls.group_internal)
cls.group_internal.authgroup.description = 'Internal Group'
cls.group_internal.authgroup.internal = True
cls.group_internal.authgroup.save()
# group 3
cls.group_hidden = AuthUtils.create_group(group_name='hidden')
cls.group_hidden = Group.objects.create(name='hidden')
AuthGroup.objects.create(group=cls.group_hidden)
cls.group_hidden.authgroup.description = 'Hidden Group'
cls.group_hidden.authgroup.internal = False
cls.group_hidden.authgroup.hidden = True
cls.group_hidden.authgroup.save()
# group 4
cls.group_open = AuthUtils.create_group(group_name='open')
cls.group_open = Group.objects.create(name='open')
AuthGroup.objects.create(group=cls.group_open)
cls.group_open.authgroup.description = 'Open Group'
cls.group_open.authgroup.internal = False
cls.group_open.authgroup.hidden = False
@ -105,7 +112,8 @@ class TestGroupManager(TestCase):
cls.group_open.authgroup.save()
# group 5
cls.group_public_1 = AuthUtils.create_group(group_name='public 1')
cls.group_public_1 = Group.objects.create(name='public 1')
AuthGroup.objects.create(group=cls.group_public_1)
cls.group_public_1.authgroup.description = 'Public Group 1'
cls.group_public_1.authgroup.internal = False
cls.group_public_1.authgroup.hidden = False
@ -113,7 +121,8 @@ class TestGroupManager(TestCase):
cls.group_public_1.authgroup.save()
# group 6
cls.group_public_2 = AuthUtils.create_group(group_name='public 2')
cls.group_public_2 = Group.objects.create(name='public 2')
AuthGroup.objects.create(group=cls.group_public_2)
cls.group_public_2.authgroup.description = 'Public Group 2'
cls.group_public_2.authgroup.internal = False
cls.group_public_2.authgroup.hidden = True
@ -122,7 +131,8 @@ class TestGroupManager(TestCase):
cls.group_public_2.authgroup.save()
# group 7
cls.group_default_member = AuthUtils.create_group(group_name='default members')
cls.group_default_member = Group.objects.create(name='default members')
AuthGroup.objects.create(group=cls.group_default_member)
cls.group_default_member.authgroup.description = \
'Default Group for members only'
cls.group_default_member.authgroup.internal = False
@ -337,8 +347,10 @@ class TestGroupManager(TestCase):
class TestPendingRequestsCountForUser(TestCase):
def setUp(self) -> None:
self.group_1 = AuthUtils.create_group(group_name="Group 1")
self.group_2 = AuthUtils.create_group(group_name="Group 2")
self.group_1 = Group.objects.create(name="Group 1")
AuthGroup.objects.create(group=self.group_1)
self.group_2 = Group.objects.create(name="Group 2")
AuthGroup.objects.create(group=self.group_2)
self.user_leader_1 = AuthUtils.create_member('Clark Kent')
self.group_1.authgroup.group_leaders.add(self.user_leader_1)
self.user_leader_2 = AuthUtils.create_member('Peter Parker')

3
allianceauth/groupmanagement/tests/test_models.py
View File

@ -20,7 +20,8 @@ def create_testdata():
EveAllianceInfo.objects.all().delete()
# group 1
group = AuthUtils.create_group(group_name='Superheros')
group = Group.objects.create(name='Superheros')
AuthGroup.objects.create(group=group)
group.authgroup.description = 'Default Group'
group.authgroup.internal = False
group.authgroup.hidden = False

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

@ -41,14 +41,17 @@ class TestCheckGroupsOnStateChange(TestCase):
and remains member of normal group and auto group
"""
# setup
state_group = AuthUtils.create_group(group_name='state_group')
state_group = Group.objects.create(name='state_group')
AuthGroup.objects.create(group=state_group)
state_group.authgroup.states.add(self.test_state_1)
state_group.authgroup.internal = False
state_group.save()
normal_group = AuthUtils.create_group(group_name='normal_group')
normal_group = Group.objects.create(name='normal_group')
AuthGroup.objects.create(group=normal_group)
normal_group.authgroup.internal = False
normal_group.save()
internal_group = AuthUtils.create_group(group_name='internal_group')
internal_group = Group.objects.create(name='internal_group')
AuthGroup.objects.create(group=internal_group)
autogroup_config = AutogroupsConfig.objects.create(corp_groups=True)
autogroup_config.states.add(self.test_state_1)
autogroup_config.states.add(self.guest_state)
@ -81,7 +84,8 @@ class TestCheckGroupsOnStateChange(TestCase):
then user remains member of that group
"""
# setup
state_group = AuthUtils.create_group(group_name='state_group')
state_group = Group.objects.create(name='state_group')
AuthGroup.objects.create(group=state_group)
state_group.authgroup.states.add(self.test_state_1)
state_group.authgroup.states.add(self.test_state_2)

4
allianceauth/services/modules/discord/tests/test_tasks.py
View File

@ -28,8 +28,8 @@ class TestUpdateGroups(TestCase):
def setUpClass(cls):
super().setUpClass()
cls.user = AuthUtils.create_member(TEST_USER_NAME)
cls.group_1 = AuthUtils.create_group(group_name='Group 1')
cls.group_2 = AuthUtils.create_group(group_name='Group 2')
cls.group_1 = Group.objects.create(name='Group 1')
cls.group_2 = Group.objects.create(name='Group 2')
cls.group_1.user_set.add(cls.user)
cls.group_2.user_set.add(cls.user)

3
allianceauth/services/modules/teamspeak3/tests.py
View File

@ -287,8 +287,7 @@ class Teamspeak3SignalsTestCase(TestCase):
# Overload transaction.on_commit so everything happens synchronously
transaction.on_commit = lambda fn: fn()
# Trigger signal (AuthTS creation)
AuthTS.objects.create(auth_group=AuthUtils.create_group(group_name='Test Group'))
AuthTS.objects.create(auth_group=Group.objects.create(name='Test Group')) # Trigger signal (AuthTS creation)
self.assertTrue(trigger_all_ts_update.called)

4
allianceauth/services/tests/test_signals.py
View File

@ -32,7 +32,7 @@ class ServicesSignalsTestCase(TestCase):
# Overload transaction.on_commit so everything happens synchronously
transaction.on_commit = lambda fn: fn()
test_group = AuthUtils.create_group(group_name="Test group")
test_group = Group.objects.create(name="Test group")
# Act, should trigger m2m change
self.member.groups.add(test_group)
@ -97,7 +97,7 @@ class ServicesSignalsTestCase(TestCase):
# Overload transaction.on_commit so everything happens synchronously
transaction.on_commit = lambda fn: fn()
test_group = AuthUtils.create_group(group_name="Test group")
test_group = Group.objects.create(name="Test group")
AuthUtils.disconnect_signals()
self.member.groups.add(test_group)
AuthUtils.connect_signals()