From ef5407be330be07393ba17b1bec89c14424e9e13 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 16 Aug 2022 16:12:21 +0200 Subject: [PATCH] tests/e2e: fix blueprint paths Signed-off-by: Jens Langhammer --- tests/e2e/test_flows_authenticators.py | 12 ++--- tests/e2e/test_flows_enroll.py | 8 +-- tests/e2e/test_flows_login.py | 4 +- tests/e2e/test_flows_stage_setup.py | 4 +- tests/e2e/test_provider_ldap.py | 16 +++--- tests/e2e/test_provider_oauth2_github.py | 28 +++++------ tests/e2e/test_provider_oauth2_grafana.py | 50 +++++++++---------- tests/e2e/test_provider_oauth2_oidc.py | 32 ++++++------ .../e2e/test_provider_oauth2_oidc_implicit.py | 32 ++++++------ tests/e2e/test_provider_proxy.py | 20 ++++---- tests/e2e/test_provider_saml.py | 50 +++++++++---------- tests/e2e/test_source_oauth.py | 32 ++++++------ tests/e2e/test_source_saml.py | 30 +++++------ 13 files changed, 159 insertions(+), 159 deletions(-) diff --git a/tests/e2e/test_flows_authenticators.py b/tests/e2e/test_flows_authenticators.py index 2da6d5e2f..fba64329e 100644 --- a/tests/e2e/test_flows_authenticators.py +++ b/tests/e2e/test_flows_authenticators.py @@ -26,8 +26,8 @@ class TestFlowsAuthenticator(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_totp_validate(self): """test flow with otp stages""" @@ -52,8 +52,8 @@ class TestFlowsAuthenticator(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint("default/20-flow-default-authenticator-totp-setup.yaml") def test_totp_setup(self): @@ -98,8 +98,8 @@ class TestFlowsAuthenticator(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint("default/20-flow-default-authenticator-static-setup.yaml") def test_static_setup(self): diff --git a/tests/e2e/test_flows_enroll.py b/tests/e2e/test_flows_enroll.py index 48b50975e..b0457c865 100644 --- a/tests/e2e/test_flows_enroll.py +++ b/tests/e2e/test_flows_enroll.py @@ -41,8 +41,8 @@ class TestFlowsEnroll(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_enroll_2_step(self): """Test 2-step enroll flow""" @@ -107,8 +107,8 @@ class TestFlowsEnroll(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_enroll_email(self): """Test enroll with Email verification""" diff --git a/tests/e2e/test_flows_login.py b/tests/e2e/test_flows_login.py index dbed9c346..69bb50f9f 100644 --- a/tests/e2e/test_flows_login.py +++ b/tests/e2e/test_flows_login.py @@ -12,8 +12,8 @@ class TestFlowsLogin(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_login(self): """test default login flow""" diff --git a/tests/e2e/test_flows_stage_setup.py b/tests/e2e/test_flows_stage_setup.py index e2ffb8164..1dc991c6e 100644 --- a/tests/e2e/test_flows_stage_setup.py +++ b/tests/e2e/test_flows_stage_setup.py @@ -20,8 +20,8 @@ class TestFlowsStageSetup(SeleniumTestCase): @retry() @apply_blueprint("default/0-flow-password-change.yaml") @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_password_change(self): """test password change flow""" diff --git a/tests/e2e/test_provider_ldap.py b/tests/e2e/test_provider_ldap.py index e05f4a3c6..71c9e49fa 100644 --- a/tests/e2e/test_provider_ldap.py +++ b/tests/e2e/test_provider_ldap.py @@ -83,8 +83,8 @@ class TestProviderLDAP(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_ldap_bind_success(self): """Test simple bind""" @@ -110,8 +110,8 @@ class TestProviderLDAP(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_ldap_bind_success_ssl(self): """Test simple bind with ssl""" @@ -137,8 +137,8 @@ class TestProviderLDAP(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) def test_ldap_bind_fail(self): """Test simple bind (failed)""" @@ -162,8 +162,8 @@ class TestProviderLDAP(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @reconcile_app("authentik_outposts") def test_ldap_bind_search(self): diff --git a/tests/e2e/test_provider_oauth2_github.py b/tests/e2e/test_provider_oauth2_github.py index f6462c8a5..f24797b90 100644 --- a/tests/e2e/test_provider_oauth2_github.py +++ b/tests/e2e/test_provider_oauth2_github.py @@ -58,15 +58,15 @@ class TestProviderOAuth2Github(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", + "system/providers-oauth2.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_consent_implied(self): @@ -114,15 +114,15 @@ class TestProviderOAuth2Github(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", + "system/providers-oauth2.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_consent_explicit(self): @@ -189,12 +189,12 @@ class TestProviderOAuth2Github(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") def test_denied(self): diff --git a/tests/e2e/test_provider_oauth2_grafana.py b/tests/e2e/test_provider_oauth2_grafana.py index e8018c5be..776a31363 100644 --- a/tests/e2e/test_provider_oauth2_grafana.py +++ b/tests/e2e/test_provider_oauth2_grafana.py @@ -67,15 +67,15 @@ class TestProviderOAuth2OAuth(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", + "system/providers-oauth2.yaml", ) @reconcile_app("authentik_crypto") def test_redirect_uri_error(self): @@ -116,15 +116,15 @@ class TestProviderOAuth2OAuth(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", + "system/providers-oauth2.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_consent_implied(self): @@ -178,15 +178,15 @@ class TestProviderOAuth2OAuth(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", + "system/providers-oauth2.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_logout(self): @@ -249,15 +249,15 @@ class TestProviderOAuth2OAuth(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", + "system/providers-oauth2.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_consent_explicit(self): @@ -329,15 +329,15 @@ class TestProviderOAuth2OAuth(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", + "system/providers-oauth2.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_denied(self): diff --git a/tests/e2e/test_provider_oauth2_oidc.py b/tests/e2e/test_provider_oauth2_oidc.py index e7f0785c7..f43e8e129 100644 --- a/tests/e2e/test_provider_oauth2_oidc.py +++ b/tests/e2e/test_provider_oauth2_oidc.py @@ -66,12 +66,12 @@ class TestProviderOAuth2OIDC(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") def test_redirect_uri_error(self): @@ -112,12 +112,12 @@ class TestProviderOAuth2OIDC(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") @apply_blueprint("system/providers-oauth2.yaml") @@ -167,12 +167,12 @@ class TestProviderOAuth2OIDC(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") @apply_blueprint("system/providers-oauth2.yaml") @@ -237,12 +237,12 @@ class TestProviderOAuth2OIDC(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_denied(self): diff --git a/tests/e2e/test_provider_oauth2_oidc_implicit.py b/tests/e2e/test_provider_oauth2_oidc_implicit.py index 123f4047e..44e7c8571 100644 --- a/tests/e2e/test_provider_oauth2_oidc_implicit.py +++ b/tests/e2e/test_provider_oauth2_oidc_implicit.py @@ -66,12 +66,12 @@ class TestProviderOAuth2OIDCImplicit(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") def test_redirect_uri_error(self): @@ -112,12 +112,12 @@ class TestProviderOAuth2OIDCImplicit(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") @apply_blueprint("system/providers-oauth2.yaml") @@ -162,12 +162,12 @@ class TestProviderOAuth2OIDCImplicit(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") @apply_blueprint("system/providers-oauth2.yaml") @@ -228,12 +228,12 @@ class TestProviderOAuth2OIDCImplicit(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") def test_authorization_denied(self): diff --git a/tests/e2e/test_provider_proxy.py b/tests/e2e/test_provider_proxy.py index c5c4111f2..5ce1683b7 100644 --- a/tests/e2e/test_provider_proxy.py +++ b/tests/e2e/test_provider_proxy.py @@ -55,16 +55,16 @@ class TestProviderProxy(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-oauth2.yaml", - "blueprints/system/providers-proxy.yaml", + "system/providers-oauth2.yaml", + "system/providers-proxy.yaml", ) @reconcile_app("authentik_crypto") def test_proxy_simple(self): @@ -126,12 +126,12 @@ class TestProviderProxyConnect(ChannelsLiveServerTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @reconcile_app("authentik_crypto") def test_proxy_connectivity(self): diff --git a/tests/e2e/test_provider_saml.py b/tests/e2e/test_provider_saml.py index 9e19c6540..67f8c0cb6 100644 --- a/tests/e2e/test_provider_saml.py +++ b/tests/e2e/test_provider_saml.py @@ -65,15 +65,15 @@ class TestProviderSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-saml.yaml", + "system/providers-saml.yaml", ) @reconcile_app("authentik_crypto") def test_sp_initiated_implicit(self): @@ -134,15 +134,15 @@ class TestProviderSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-saml.yaml", + "system/providers-saml.yaml", ) @reconcile_app("authentik_crypto") def test_sp_initiated_explicit(self): @@ -218,15 +218,15 @@ class TestProviderSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-saml.yaml", + "system/providers-saml.yaml", ) @reconcile_app("authentik_crypto") def test_sp_initiated_explicit_post(self): @@ -302,15 +302,15 @@ class TestProviderSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-saml.yaml", + "system/providers-saml.yaml", ) @reconcile_app("authentik_crypto") def test_idp_initiated_implicit(self): @@ -377,15 +377,15 @@ class TestProviderSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/system/providers-saml.yaml", + "system/providers-saml.yaml", ) @reconcile_app("authentik_crypto") def test_sp_initiated_denied(self): diff --git a/tests/e2e/test_source_oauth.py b/tests/e2e/test_source_oauth.py index 24627d318..1320207ee 100644 --- a/tests/e2e/test_source_oauth.py +++ b/tests/e2e/test_source_oauth.py @@ -143,17 +143,17 @@ class TestSourceOAuth2(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-source-authentication.yaml", - "blueprints/default/20-flow-default-source-enrollment.yaml", - "blueprints/default/20-flow-default-source-pre-authentication.yaml", + "default/20-flow-default-source-authentication.yaml", + "default/20-flow-default-source-enrollment.yaml", + "default/20-flow-default-source-pre-authentication.yaml", ) def test_oauth_enroll(self): """test OAuth Source With With OIDC""" @@ -200,12 +200,12 @@ class TestSourceOAuth2(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-provider-authorization-explicit-consent.yaml", - "blueprints/default/20-flow-default-provider-authorization-implicit-consent.yaml", + "default/20-flow-default-provider-authorization-explicit-consent.yaml", + "default/20-flow-default-provider-authorization-implicit-consent.yaml", ) def test_oauth_enroll_auth(self): """test OAuth Source With With OIDC (enroll and authenticate again)""" @@ -292,13 +292,13 @@ class TestSourceOAuth1(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-source-authentication.yaml", - "blueprints/default/20-flow-default-source-enrollment.yaml", - "blueprints/default/20-flow-default-source-pre-authentication.yaml", + "default/20-flow-default-source-authentication.yaml", + "default/20-flow-default-source-enrollment.yaml", + "default/20-flow-default-source-pre-authentication.yaml", ) def test_oauth_enroll(self): """test OAuth Source With With OIDC""" diff --git a/tests/e2e/test_source_saml.py b/tests/e2e/test_source_saml.py index 20c74abb5..d98a09a6a 100644 --- a/tests/e2e/test_source_saml.py +++ b/tests/e2e/test_source_saml.py @@ -96,13 +96,13 @@ class TestSourceSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-source-authentication.yaml", - "blueprints/default/20-flow-default-source-enrollment.yaml", - "blueprints/default/20-flow-default-source-pre-authentication.yaml", + "default/20-flow-default-source-authentication.yaml", + "default/20-flow-default-source-enrollment.yaml", + "default/20-flow-default-source-pre-authentication.yaml", ) def test_idp_redirect(self): """test SAML Source With redirect binding""" @@ -166,13 +166,13 @@ class TestSourceSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-source-authentication.yaml", - "blueprints/default/20-flow-default-source-enrollment.yaml", - "blueprints/default/20-flow-default-source-pre-authentication.yaml", + "default/20-flow-default-source-authentication.yaml", + "default/20-flow-default-source-enrollment.yaml", + "default/20-flow-default-source-pre-authentication.yaml", ) def test_idp_post(self): """test SAML Source With post binding""" @@ -249,13 +249,13 @@ class TestSourceSAML(SeleniumTestCase): @retry() @apply_blueprint( - "blueprints/default/10-flow-default-authentication-flow.yaml", - "blueprints/default/10-flow-default-invalidation-flow.yaml", + "default/10-flow-default-authentication-flow.yaml", + "default/10-flow-default-invalidation-flow.yaml", ) @apply_blueprint( - "blueprints/default/20-flow-default-source-authentication.yaml", - "blueprints/default/20-flow-default-source-enrollment.yaml", - "blueprints/default/20-flow-default-source-pre-authentication.yaml", + "default/20-flow-default-source-authentication.yaml", + "default/20-flow-default-source-enrollment.yaml", + "default/20-flow-default-source-pre-authentication.yaml", ) def test_idp_post_auto(self): """test SAML Source With post binding (auto redirect)"""