Merge branch 'master' into consent-mode

This commit is contained in:
Jens Langhammer 2020-07-20 13:59:09 +02:00
commit 9ff3ee7c0c
2 changed files with 14 additions and 26 deletions

View File

@ -29,7 +29,7 @@ class TestProviderOAuth(SeleniumTestCase):
"""Setup client grafana container which we test OAuth against"""
client: DockerClient = from_env()
container = client.containers.run(
image="grafana/grafana:latest",
image="grafana/grafana:7.1.0",
detach=True,
network_mode="host",
auto_remove=True,
@ -104,22 +104,19 @@ class TestProviderOAuth(SeleniumTestCase):
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[1]/div/input",
By.CSS_SELECTOR, "input[name=name]"
).get_attribute("value"),
USER().username,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[2]/div/input",
By.CSS_SELECTOR, "input[name=email]"
).get_attribute("value"),
USER().email,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[3]/div/input",
By.CSS_SELECTOR, "input[name=login]"
).get_attribute("value"),
USER().username,
)
@ -176,22 +173,19 @@ class TestProviderOAuth(SeleniumTestCase):
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[1]/div/input",
By.CSS_SELECTOR, "input[name=name]"
).get_attribute("value"),
USER().username,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[2]/div/input",
By.CSS_SELECTOR, "input[name=email]"
).get_attribute("value"),
USER().email,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[3]/div/input",
By.CSS_SELECTOR, "input[name=login]"
).get_attribute("value"),
USER().username,
)

View File

@ -32,7 +32,7 @@ class TestProviderOIDC(SeleniumTestCase):
"""Setup client grafana container which we test OIDC against"""
client: DockerClient = from_env()
container = client.containers.run(
image="grafana/grafana:latest",
image="grafana/grafana:7.1.0",
detach=True,
network_mode="host",
auto_remove=True,
@ -154,22 +154,19 @@ class TestProviderOIDC(SeleniumTestCase):
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[1]/div/input",
By.CSS_SELECTOR, "input[name=name]"
).get_attribute("value"),
USER().name,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[2]/div/input",
By.CSS_SELECTOR, "input[name=email]"
).get_attribute("value"),
USER().email,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[3]/div/input",
By.CSS_SELECTOR, "input[name=login]"
).get_attribute("value"),
USER().email,
)
@ -236,22 +233,19 @@ class TestProviderOIDC(SeleniumTestCase):
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[1]/div/input",
By.CSS_SELECTOR, "input[name=name]"
).get_attribute("value"),
USER().name,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[2]/div/input",
By.CSS_SELECTOR, "input[name=email]"
).get_attribute("value"),
USER().email,
)
self.assertEqual(
self.driver.find_element(
By.XPATH,
"/html/body/grafana-app/div/div/div/react-profile-wrapper/form[1]/div[3]/div/input",
By.CSS_SELECTOR, "input[name=login]"
).get_attribute("value"),
USER().email,
)