Update tests to use the create_group util.

allianceauth/groupmanagement/tests/test_admin.py

@@ -10,6 +10,7 @@ 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
@@ -38,31 +39,27 @@ class TestGroupAdmin(TestCase):
         super().setUpClass()
 
         # group 1 - has leader
-        cls.group_1 = Group.objects.create(name='Group 1')
+        cls.group_1 = AuthUtils.create_group(group_name='Group 1')
-        AuthGroup.objects.create(group=cls.group_1)
         cls.group_1.authgroup.description = 'Default Group'
         cls.group_1.authgroup.internal = False
         cls.group_1.authgroup.hidden = False
         cls.group_1.authgroup.save()
 
         # group 2 - no leader
-        cls.group_2 = Group.objects.create(name='Group 2')
+        cls.group_2 = AuthUtils.create_group(group_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 = Group.objects.create(name='Group 3')
+        cls.group_3 = AuthUtils.create_group(group_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 = Group.objects.create(name='Group 4')
+        cls.group_4 = AuthUtils.create_group(group_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
@@ -70,8 +67,7 @@ class TestGroupAdmin(TestCase):
         cls.group_4.authgroup.save()
 
         # group 5 - no leader
-        cls.group_5 = Group.objects.create(name='Group 5')
+        cls.group_5 = AuthUtils.create_group(group_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
@@ -79,8 +75,7 @@ class TestGroupAdmin(TestCase):
         cls.group_5.authgroup.save()
 
         # group 6 - no leader
-        cls.group_6 = Group.objects.create(name='Group 6')
+        cls.group_6 = AuthUtils.create_group(group_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

allianceauth/groupmanagement/tests/test_managers.py

@@ -28,12 +28,9 @@ 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 = Group.objects.create(name='group1')
+        cls.group1 = AuthUtils.create_group(group_name='group1')
-        AuthGroup.objects.create(group=cls.group1)
+        cls.group2 = AuthUtils.create_group(group_name='group2')
-        cls.group2 = Group.objects.create(name='group2')
+        cls.group3 = AuthUtils.create_group(group_name='group3')
-        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()
@@ -80,31 +77,27 @@ class TestGroupManager(TestCase):
         super().setUpClass()
 
         # group 1
-        cls.group_default = Group.objects.create(name='default')
+        cls.group_default = AuthUtils.create_group(group_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 = Group.objects.create(name='internal')
+        cls.group_internal = AuthUtils.create_group(group_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 = Group.objects.create(name='hidden')
+        cls.group_hidden = AuthUtils.create_group(group_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 = Group.objects.create(name='open')
+        cls.group_open = AuthUtils.create_group(group_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
@@ -112,8 +105,7 @@ class TestGroupManager(TestCase):
         cls.group_open.authgroup.save()
 
         # group 5
-        cls.group_public_1 = Group.objects.create(name='public 1')
+        cls.group_public_1 = AuthUtils.create_group(group_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
@@ -121,8 +113,7 @@ class TestGroupManager(TestCase):
         cls.group_public_1.authgroup.save()
 
         # group 6
-        cls.group_public_2 = Group.objects.create(name='public 2')
+        cls.group_public_2 = AuthUtils.create_group(group_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
@@ -131,8 +122,7 @@ class TestGroupManager(TestCase):
         cls.group_public_2.authgroup.save()
 
         # group 7
-        cls.group_default_member = Group.objects.create(name='default members')
+        cls.group_default_member = AuthUtils.create_group(group_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
@@ -347,10 +337,8 @@ class TestGroupManager(TestCase):
 class TestPendingRequestsCountForUser(TestCase):
             
     def setUp(self) -> None:
-        self.group_1 = Group.objects.create(name="Group 1")
+        self.group_1 = AuthUtils.create_group(group_name="Group 1")
-        AuthGroup.objects.create(group=self.group_1)
+        self.group_2 = AuthUtils.create_group(group_name="Group 2")
-        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')

allianceauth/groupmanagement/tests/test_models.py

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

allianceauth/groupmanagement/tests/test_signals.py

@@ -41,17 +41,14 @@ class TestCheckGroupsOnStateChange(TestCase):
         and remains member of normal group and auto group
         """
         # setup
-        state_group = Group.objects.create(name='state_group')
+        state_group = AuthUtils.create_group(group_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 = Group.objects.create(name='normal_group')
+        normal_group = AuthUtils.create_group(group_name='normal_group')
-        AuthGroup.objects.create(group=normal_group)
         normal_group.authgroup.internal = False
         normal_group.save()
-        internal_group = Group.objects.create(name='internal_group')
+        internal_group = AuthUtils.create_group(group_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)
@@ -84,8 +81,7 @@ class TestCheckGroupsOnStateChange(TestCase):
         then user remains member of that group
         """
         # setup
-        state_group = Group.objects.create(name='state_group')
+        state_group = AuthUtils.create_group(group_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)
                 

allianceauth/services/modules/discord/tests/test_tasks.py

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

allianceauth/services/modules/teamspeak3/tests.py

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

allianceauth/services/tests/test_signals.py

@@ -32,7 +32,7 @@ class ServicesSignalsTestCase(TestCase):
         # Overload transaction.on_commit so everything happens synchronously
         transaction.on_commit = lambda fn: fn()
 
-        test_group = Group.objects.create(name="Test group")
+        test_group = AuthUtils.create_group(group_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 = Group.objects.create(name="Test group")
+        test_group = AuthUtils.create_group(group_name="Test group")
         AuthUtils.disconnect_signals()
         self.member.groups.add(test_group)
         AuthUtils.connect_signals()