🐛[#114] fix tests

maykinmedia · Oct 22, 2024 · 2dccbf8 · 2dccbf8
1 parent 216b821
commit 2dccbf8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/mozilla_django_oidc_db/setupconfig/bootstrap.py b/mozilla_django_oidc_db/setupconfig/bootstrap.py
@@ -2,7 +2,7 @@
 from django.contrib.auth.models import Group
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import RequestFactory
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from django_setup_configuration.config_settings import ConfigSettings
 from django_setup_configuration.configuration import BaseConfigurationStep
@@ -38,7 +38,7 @@ def configure(self):
         all_settings = {
             "sync_groups": config.sync_groups,
             "oidc_use_nonce": config.oidc_use_nonce,
-            **settings.OIDC_DB_SETUP_CONFIG_ADMIN_AUTH
+            **settings.OIDC_DB_SETUP_CONFIG_ADMIN_AUTH,
         }
 
         if "default_groups" in all_settings:

diff --git a/tests/setupconfig/conftest.py b/tests/setupconfig/conftest.py
@@ -1,11 +1,16 @@
 import pytest
-from mozilla_django_oidc_db.models import UserInformationClaimsSources
 
+from mozilla_django_oidc_db.models import UserInformationClaimsSources
 
 from ..conftest import KEYCLOAK_BASE_URL
 
 """
-Key cloak credentials are setup for the keycloak docker-compose.yml
+Key cloak credentials are setup for the keycloak docker-compose.yml.
+
+`oidc_rp_client_id` and `oidc_rp_client_secret` are taken from the keycloak fixture
+in /docker/import/test-reaml.json
+
+See more info in /docker/README.md
 
 """
 
@@ -22,8 +27,8 @@ def setup_config_discovery(settings):
 @pytest.fixture
 def setup_config_defaults(settings):
     settings.OIDC_DB_SETUP_CONFIG_ADMIN_AUTH = {
-        "oidc_rp_client_id": "testid",
-        "oidc_rp_client_secret": "7DB3KUAAizYCcmZufpHRVOcD0TOkNO3I",
+        "oidc_rp_client_id": "client-id",
+        "oidc_rp_client_secret": "secret",
         "oidc_op_authorization_endpoint": f"{KEYCLOAK_BASE_URL}protocol/openid-connect/auth",
         "oidc_op_token_endpoint": f"{KEYCLOAK_BASE_URL}protocol/openid-connect/token",
         "oidc_op_user_endpoint": f"{KEYCLOAK_BASE_URL}protocol/openid-connect/userinfo",
@@ -34,8 +39,8 @@ def setup_config_defaults(settings):
 def setup_config_full(settings):
 
     settings.OIDC_DB_SETUP_CONFIG_ADMIN_AUTH = {
-        "oidc_rp_client_id": "testid",
-        "oidc_rp_client_secret": "7DB3KUAAizYCcmZufpHRVOcD0TOkNO3I",
+        "oidc_rp_client_id": "client-id",
+        "oidc_rp_client_secret": "secret",
         "oidc_rp_scopes_list": ["open_id", "email", "profile", "extra_scope"],
         "oidc_rp_sign_algo": "RS256",
         "oidc_rp_idp_sign_key": "key",

diff --git a/tests/setupconfig/test_auth.py b/tests/setupconfig/test_auth.py
@@ -14,6 +14,7 @@
 
 from ..conftest import KEYCLOAK_BASE_URL
 
+
 @pytest.fixture(autouse=True)
 def clear_solo_cache():
     yield
@@ -53,7 +54,7 @@ def test_configure(setup_config_full):
     )
     assert config.username_claim == ["claim_name"]
     assert config.groups_claim == ["groups_claim_name"]
-    assert config.claim_mapping == {"first_name": "given_name"}
+    assert config.claim_mapping == {"first_name": ["given_name"]}
     assert not config.sync_groups
     assert config.sync_groups_glob_pattern == "local.groups.*"
     assert list(group.name for group in config.default_groups.all()) == [