trustchain-oc1-orchestral
/
authentik
Archived
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'next' into version-2021.3

This commit is contained in:
Jens Langhammer 2021-03-16 19:12:55 +01:00
parent dc1e17ba0c 9784c6c828
commit 9e71287c25
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/e2e/test_flows_enroll.py
View File

@ -93,7 +93,10 @@ class TestFlowsEnroll(SeleniumTestCase):
self.initial_stages() self.initial_stages()
self.wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar"))) interface_admin = self.get_shadow_root("ak-interface-admin")
wait = WebDriverWait(interface_admin, self.wait_timeout)
wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar")))
self.driver.get(self.shell_url("authentik_core:user-settings")) self.driver.get(self.shell_url("authentik_core:user-settings"))
user = User.objects.get(username="foo") user = User.objects.get(username="foo")
@ -188,7 +191,11 @@ class TestFlowsEnroll(SeleniumTestCase):
self.driver.switch_to.window(self.driver.window_handles[0]) self.driver.switch_to.window(self.driver.window_handles[0])
# We're now logged in # We're now logged in
self.wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar"))) wait = WebDriverWait(
self.get_shadow_root("ak-interface-admin"), self.wait_timeout
)
wait.until(ec.presence_of_element_located((By.CSS_SELECTOR, "ak-sidebar")))
self.driver.get(self.shell_url("authentik_core:user-settings")) self.driver.get(self.shell_url("authentik_core:user-settings"))
self.assert_user(User.objects.get(username="foo")) self.assert_user(User.objects.get(username="foo"))

5
web/rollup.config.js
View File

@ -15,9 +15,10 @@ const resources = [
{ src: "./icons/*", dest: "dist/assets/icons" }, { src: "./icons/*", dest: "dist/assets/icons" },
]; ];
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
function manualChunks(id) { function manualChunks(id) {
if (id.includes('node_modules')) { if (id.includes("node_modules")) {
return 'vendor'; return "vendor";
} }
if (id.includes("src/api/")) { if (id.includes("src/api/")) {
return "api"; return "api";