diff --git a/gregsite/settings/testing.py b/gregsite/settings/testing.py index fa99b44bf7f7f39459069d64930c32521a7ae72d..1733f0aacde9930f326c7c14551ddb136e38da69 100644 --- a/gregsite/settings/testing.py +++ b/gregsite/settings/testing.py @@ -7,8 +7,8 @@ AUTHENTICATION_BACKENDS = [ "sesame.backends.ModelBackend", # link login ] -OIDC_RP_CLIENT_ID = 'lalalalala' -OIDC_RP_CLIENT_SECRET = 'lalalalala' +OIDC_RP_CLIENT_ID = "lalalalala" +OIDC_RP_CLIENT_SECRET = "lalalalala" LOGIN_REDIRECT_URL = "http://localhost:3000/" LOGOUT_REDIRECT_URL = "http://localhost:3000/" @@ -42,4 +42,3 @@ Q_CLUSTER = { "orm": "default", "sync": True, } - diff --git a/gregui/tests/conftest.py b/gregui/tests/conftest.py index 8f98331f2f0882c010cd3d469cfbcfe78251e1df..7634fe47467a287d0bccbe100779919a6d45daaf 100644 --- a/gregui/tests/conftest.py +++ b/gregui/tests/conftest.py @@ -56,6 +56,7 @@ def id_token_payload(): "nonce": "noncenonce", } + @pytest.fixture def data(): return { @@ -76,7 +77,7 @@ def data(): "person1": { "type": "feide_id", "value": "foo@example.com", - "person": { "email": "foo@example.com" } + "person": {"email": "foo@example.com"}, }, }, "Person": { @@ -84,7 +85,7 @@ def data(): "first_name": "Foo", "last_name": "Baresen", "email": "foo@example.com", - }, + }, }, "Sponsor": { "sponsor1": { @@ -101,10 +102,10 @@ def save_object(model, **kwargs): obj.save() return obj + # TODO add person and sponsor OBJECT_MAPPING = { - "greg" - "person": Person, + "greg" "person": Person, "sponsor": Sponsor, "user": get_user_model(), } diff --git a/gregui/tests/test_oidc.py b/gregui/tests/test_oidc.py index 94e755916f6efb4b43b6cb62d74efcfa5521fd89..8af01270af73a3f4e9ca27d77f45cd213fb1d332 100644 --- a/gregui/tests/test_oidc.py +++ b/gregui/tests/test_oidc.py @@ -2,9 +2,8 @@ import time import pytest from django.core.exceptions import SuspiciousOperation -from django.conf import settings -from greg.models import Identity, Person, Sponsor +from greg.models import Identity from gregui.authentication.auth_backends import GregOIDCBackend from gregui.models import GregUserProfile @@ -63,8 +62,8 @@ def test_create_user(claims): assert person.last_name == user.last_name assert person.email == user.email - ids = Identity.objects.get(person=person, type='feide_id') - assert ids.value == 'frank_foreleser@spusers.feide.no' + ids = Identity.objects.get(person=person, type="feide_id") + assert ids.value == "frank_foreleser@spusers.feide.no" def test_update_user(greg_users, claims):