From b83bd624d2d039bdbd71aa2593c3c4b1c64b6061 Mon Sep 17 00:00:00 2001
From: Sivert Hatteberg <sivert.hatteberg@usit.uio.no>
Date: Wed, 13 Oct 2021 13:18:07 +0200
Subject: [PATCH] Fix linting
---
gregsite/settings/testing.py | 5 ++---
gregui/tests/conftest.py | 12 ++++++------
gregui/tests/test_oidc.py | 7 +++----
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/gregsite/settings/testing.py b/gregsite/settings/testing.py
index fa99b44b..1733f0aa 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 fb391d8b..6cbba2ef 100644
--- a/gregui/tests/conftest.py
+++ b/gregui/tests/conftest.py
@@ -5,7 +5,6 @@ from rest_framework.test import APIClient
from django.contrib.auth import get_user_model
from greg.models import Person, Sponsor
-from gregui.models import GregUserProfile
# from greg.models import (
# Consent,
@@ -49,6 +48,7 @@ def id_token_payload():
"nonce": "noncenonce",
}
+
@pytest.fixture
def data():
return {
@@ -69,7 +69,7 @@ def data():
"person1": {
"type": "feide_id",
"value": "foo@example.com",
- "person": { "email": "foo@example.com" }
+ "person": {"email": "foo@example.com"},
},
},
"Person": {
@@ -77,7 +77,7 @@ def data():
"first_name": "Foo",
"last_name": "Baresen",
"email": "foo@example.com",
- },
+ },
},
"Sponsor": {
"sponsor1": {
@@ -94,10 +94,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(),
}
@@ -147,4 +147,4 @@ def log_in(client, greg_users):
session.save()
return client
- return _log_in
\ No newline at end of file
+ return _log_in
diff --git a/gregui/tests/test_oidc.py b/gregui/tests/test_oidc.py
index 94e75591..8af01270 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):
--
GitLab