Fix issue #1219

allianceauth/authentication/tests/test_admin.py

@@ -1,12 +1,12 @@
 from unittest.mock import patch
 
-from django.test import TestCase, RequestFactory
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import User as BaseUser, Group
+from django.test import TestCase, RequestFactory
 
 from allianceauth.authentication.models import CharacterOwnership, State
-from allianceauth.eveonline.autogroups.models import AutogroupsConfig
 from allianceauth.eveonline.models import (
     EveCharacter, EveCorporationInfo, EveAllianceInfo
 )
@@ -22,6 +22,11 @@ from ..admin import (
     user_username,     
 )
 
+if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+    _has_auto_groups = True
+    from allianceauth.eveonline.autogroups.models import AutogroupsConfig
+else:
+    _has_auto_groups = False
 
 MODULE_PATH = 'allianceauth.authentication.admin'
 
@@ -174,6 +179,7 @@ class TestUserAdmin(TestCase):
 
     def _create_autogroups(self):
         """create autogroups for corps and alliances"""
+        if _has_auto_groups:
             autogroups_config = AutogroupsConfig(
                 corp_groups = True,
                 alliance_groups = True

allianceauth/authentication/tests/test_app_settings.py

@@ -1,11 +1,11 @@
 from unittest.mock import Mock, patch
-
 from django.test import TestCase
 
 from .. import app_settings
 
 MODULE_PATH = 'allianceauth.authentication'
 
+
 class TestSetAppSetting(TestCase):
 
     @patch(MODULE_PATH + '.app_settings.settings')
@@ -17,7 +17,6 @@ class TestSetAppSetting(TestCase):
         )
         self.assertEqual(result, False)
 
-
     @patch(MODULE_PATH + '.app_settings.settings')
     def test_default_if_not_set_for_none(self, mock_settings):        
         mock_settings.TEST_SETTING_DUMMY = Mock(spec=None)
@@ -28,7 +27,6 @@ class TestSetAppSetting(TestCase):
         )
         self.assertEqual(result, None)
 
-
     @patch(MODULE_PATH + '.app_settings.settings')
     def test_true_stays_true(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = True
@@ -56,7 +54,6 @@ class TestSetAppSetting(TestCase):
         )
         self.assertEqual(result, False)
 
-
     @patch(MODULE_PATH + '.app_settings.settings')
     def test_default_for_invalid_type_int(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = 'invalid type'
@@ -95,7 +92,6 @@ class TestSetAppSetting(TestCase):
         )
         self.assertEqual(result, 50)
 
-    
     @patch(MODULE_PATH + '.app_settings.settings')
     def test_default_is_none_needs_required_type(self, mock_settings):
         mock_settings.TEST_SETTING_DUMMY = 'invalid type'
@@ -104,5 +100,3 @@ class TestSetAppSetting(TestCase):
                 'TEST_SETTING_DUMMY',             
                 default_value=None
             )
-        
-

allianceauth/groupmanagement/admin.py

@@ -103,14 +103,16 @@ class GroupAdmin(admin.ModelAdmin):
         '_member_count', 
         'has_leader'
     )
-    list_filter = (
+    list_filter = [
         'authgroup__internal', 
         'authgroup__hidden', 
         'authgroup__open', 
         'authgroup__public',        
-        IsAutoGroupFilter,
+    ]
-        HasLeaderFilter
+    if _has_auto_groups:
-    )
+        list_filter.append(IsAutoGroupFilter)
+    list_filter.append(HasLeaderFilter)
+
     search_fields = ('name', 'authgroup__description')
     
     def get_queryset(self, request):

allianceauth/groupmanagement/tests/test_admin.py

@@ -1,23 +1,29 @@
 from unittest.mock import patch
 
-from django.test import TestCase, RequestFactory
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.admin.sites import AdminSite
 from django.contrib.auth.models import User
+from django.test import TestCase, RequestFactory
 
 from allianceauth.authentication.models import CharacterOwnership, State
-from allianceauth.eveonline.autogroups.models import AutogroupsConfig
 from allianceauth.eveonline.models import (
     EveCharacter, EveCorporationInfo, EveAllianceInfo
 )
 
 from ..admin import (   
-   IsAutoGroupFilter,
    HasLeaderFilter,
    GroupAdmin,   
    Group
 )
 
+if 'allianceauth.eveonline.autogroups' in settings.INSTALLED_APPS:
+    _has_auto_groups = True
+    from allianceauth.eveonline.autogroups.models import AutogroupsConfig
+    from ..admin import IsAutoGroupFilter
+else:
+    _has_auto_groups = False
+
 
 MODULE_PATH = 'allianceauth.groupmanagement.admin'
 
@@ -210,6 +216,7 @@ class TestGroupAdmin(TestCase):
 
     def _create_autogroups(self):
         """create autogroups for corps and alliances"""
+        if _has_auto_groups:
             autogroups_config = AutogroupsConfig(
                 corp_groups = True,
                 alliance_groups = True
@@ -267,6 +274,7 @@ class TestGroupAdmin(TestCase):
         result = self.modeladmin._properties(self.group_6)
         self.assertListEqual(result, expected)
 
+    if _has_auto_groups:
         @patch(MODULE_PATH + '._has_auto_groups', True)
         def test_properties_6(self):
             self._create_autogroups()
@@ -281,6 +289,7 @@ class TestGroupAdmin(TestCase):
    
     # filters
     
+    if _has_auto_groups:
         @patch(MODULE_PATH + '._has_auto_groups', True)
         def test_filter_is_auto_group(self):