✅[#114] use setup config management command

maykinmedia · Aug 14, 2024 · 68d3a61 · 68d3a61
1 parent 8761799
commit 68d3a61
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/...la_django_oidc_db/setupconfig/boostrap.py → ...a_django_oidc_db/setupconfig/bootstrap.py b/...la_django_oidc_db/setupconfig/boostrap.py → ...a_django_oidc_db/setupconfig/bootstrap.py
diff --git a/testapp/settings.py b/testapp/settings.py
@@ -80,3 +80,16 @@
 LOGIN_REDIRECT_URL = reverse_lazy("admin:index")
 
 STATIC_URL = "/static/"
+
+# Django setup configuration settings
+try:
+    import django_setup_configuration
+
+    INSTALLED_APPS += ["django_setup_configuration"]
+
+    OIDC_DB_CONFIG_ENABLE = True
+    SETUP_CONFIGURATION_STEPS = [
+        "mozilla_django_oidc_db.setupconfig.bootstrap.AdminOIDCConfigurationStep",
+    ]
+except ImportError:
+    pass
diff --git a/tests/setupconfig/test_auth.py b/tests/setupconfig/test_auth.py
@@ -1,4 +1,4 @@
-from django.test import override_settings
+from django.core.management import call_command
 
 import pytest
 import requests
@@ -8,14 +8,14 @@
     OpenIDConnectConfig,
     UserInformationClaimsSources,
 )
-from mozilla_django_oidc_db.setupconfig.boostrap import AdminOIDCConfigurationStep
+from mozilla_django_oidc_db.setupconfig.bootstrap import AdminOIDCConfigurationStep
 
 from ..conftest import KEYCLOAK_BASE_URL
 
 
 @pytest.mark.django_db
 def test_configure(setup_config_full):
-    AdminOIDCConfigurationStep().configure()
+    call_command("setup_configuration")
 
     config = OpenIDConnectConfig.get_solo()
 
@@ -61,6 +61,7 @@ def test_configure(setup_config_full):
 
 @pytest.mark.django_db
 def test_configure_use_defaults(setup_config_defaults):
+    call_command("setup_configuration")
 
     AdminOIDCConfigurationStep().configure()
 
@@ -110,8 +111,7 @@ def test_configure_use_defaults(setup_config_defaults):
 @pytest.mark.vcr
 @pytest.mark.django_db
 def test_configure_use_discovery_endpoint(setup_config_discovery):
-
-    AdminOIDCConfigurationStep().configure()
+    call_command("setup_configuration")
 
     config = OpenIDConnectConfig.get_solo()
 
@@ -136,7 +136,7 @@ def test_configure_use_discovery_endpoint(setup_config_discovery):
 
 
 @pytest.mark.django_db
-def test_configure_failure(requests_mock, setup_config_discovery):
+def test_configure_discovery_failure(requests_mock, setup_config_discovery):
     mock_kwargs = (
         {"exc": requests.ConnectTimeout},
         {"exc": requests.ConnectionError},