e2e: use reverse instead of static URLs

This commit is contained in:
Jens Langhammer 2020-06-20 17:06:15 +02:00
parent 68efcc7bf2
commit 17424ccc3b
2 changed files with 7 additions and 7 deletions

View File

@ -2,6 +2,7 @@
from time import sleep from time import sleep
from django.contrib.staticfiles.testing import StaticLiveServerTestCase from django.contrib.staticfiles.testing import StaticLiveServerTestCase
from django.shortcuts import reverse
from oauth2_provider.generators import generate_client_id, generate_client_secret from oauth2_provider.generators import generate_client_id, generate_client_secret
from oidc_provider.models import Client, ResponseType from oidc_provider.models import Client, ResponseType
from selenium import webdriver from selenium import webdriver
@ -33,7 +34,7 @@ class TestProviderOIDC(SeleniumTestCase):
container = client.containers.run( container = client.containers.run(
image="grafana/grafana:latest", image="grafana/grafana:latest",
detach=True, detach=True,
name=f"passbook-e2e-grafana-client_{self.port}", name="passbook-e2e-grafana-client",
network_mode="host", network_mode="host",
auto_remove=True, auto_remove=True,
healthcheck=Healthcheck( healthcheck=Healthcheck(
@ -47,13 +48,13 @@ class TestProviderOIDC(SeleniumTestCase):
"GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET": self.client_secret, "GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET": self.client_secret,
"GF_AUTH_GENERIC_OAUTH_SCOPES": "openid email profile", "GF_AUTH_GENERIC_OAUTH_SCOPES": "openid email profile",
"GF_AUTH_GENERIC_OAUTH_AUTH_URL": ( "GF_AUTH_GENERIC_OAUTH_AUTH_URL": (
f"{self.live_server_url}/application/oidc/authorize" self.live_server_url + reverse("passbook_providers_oidc:authorize")
), ),
"GF_AUTH_GENERIC_OAUTH_TOKEN_URL": ( "GF_AUTH_GENERIC_OAUTH_TOKEN_URL": (
f"{self.live_server_url}/application/oidc/token" self.live_server_url + reverse("oidc_provider:token")
), ),
"GF_AUTH_GENERIC_OAUTH_API_URL": ( "GF_AUTH_GENERIC_OAUTH_API_URL": (
f"{self.live_server_url}/application/oidc/userinfo" self.live_server_url + reverse("oidc_provider:userinfo")
), ),
"GF_LOG_LEVEL": "debug", "GF_LOG_LEVEL": "debug",
}, },
@ -66,9 +67,8 @@ class TestProviderOIDC(SeleniumTestCase):
sleep(1) sleep(1)
def tearDown(self): def tearDown(self):
super().tearDown()
self.driver.quit()
self.container.kill() self.container.kill()
super().tearDown()
def test_redirect_uri_error(self): def test_redirect_uri_error(self):
"""test OpenID Provider flow (invalid redirect URI, check error message)""" """test OpenID Provider flow (invalid redirect URI, check error message)"""

View File

@ -39,8 +39,8 @@ class SeleniumTestCase(StaticLiveServerTestCase):
) )
def tearDown(self): def tearDown(self):
super().tearDown()
self.driver.quit() self.driver.quit()
super().tearDown()
def apply_default_data(self): def apply_default_data(self):
"""apply objects created by migrations after tables have been truncated""" """apply objects created by migrations after tables have been truncated"""