From f5e82f418ec0cd6909c74cb95e8e8bd9df19cb0c Mon Sep 17 00:00:00 2001 From: Elio Bischof Date: Sun, 8 Jun 2025 10:09:34 +0200 Subject: [PATCH] fix integration env --- Makefile | 2 +- acceptance/pat/.gitignore | 2 -- apps/core-mock/Dockerfile | 2 +- {acceptance => apps/login-acceptance-testsuite}/Dockerfile | 0 .../login-acceptance-testsuite}/docker-compose.yaml | 0 .../login-acceptance-testsuite}/idp/oidc/docker-compose.yaml | 0 .../login-acceptance-testsuite}/idp/oidc/go.mod | 0 .../login-acceptance-testsuite}/idp/oidc/go.sum | 0 .../login-acceptance-testsuite}/idp/oidc/main.go | 0 .../login-acceptance-testsuite}/idp/saml/docker-compose.yaml | 0 .../login-acceptance-testsuite}/idp/saml/go.mod | 0 .../login-acceptance-testsuite}/idp/saml/go.sum | 0 .../login-acceptance-testsuite}/idp/saml/main.go | 0 .../login-acceptance-testsuite}/oidc/docker-compose.yaml | 0 {acceptance => apps/login-acceptance-testsuite}/oidc/go.mod | 0 {acceptance => apps/login-acceptance-testsuite}/oidc/go.sum | 0 {acceptance => apps/login-acceptance-testsuite}/oidc/main.go | 0 {acceptance => apps/login-acceptance-testsuite}/pat/.gitkeep | 0 .../login-acceptance-testsuite}/saml/docker-compose.yaml | 0 {acceptance => apps/login-acceptance-testsuite}/saml/go.mod | 0 {acceptance => apps/login-acceptance-testsuite}/saml/go.sum | 0 {acceptance => apps/login-acceptance-testsuite}/saml/main.go | 0 {acceptance => apps/login-acceptance-testsuite}/setup.sh | 0 {acceptance => apps/login-acceptance-testsuite}/sink/go.mod | 0 {acceptance => apps/login-acceptance-testsuite}/sink/main.go | 0 .../login-acceptance-testsuite}/tests/admin.spec.ts | 0 .../login-acceptance-testsuite}/tests/code-screen.ts | 0 {acceptance => apps/login-acceptance-testsuite}/tests/code.ts | 0 .../login-acceptance-testsuite}/tests/email-verify-screen.ts | 0 .../login-acceptance-testsuite}/tests/email-verify.spec.ts | 0 .../login-acceptance-testsuite}/tests/email-verify.ts | 0 .../login-acceptance-testsuite}/tests/idp-apple.spec.ts | 0 .../login-acceptance-testsuite}/tests/idp-generic-jwt.spec.ts | 0 .../tests/idp-generic-oauth.spec.ts | 0 .../tests/idp-generic-oidc.spec.ts | 0 .../tests/idp-github-enterprise.spec.ts | 0 .../login-acceptance-testsuite}/tests/idp-github.spec.ts | 0 .../tests/idp-gitlab-self-hosted.spec.ts | 0 .../login-acceptance-testsuite}/tests/idp-gitlab.spec.ts | 0 .../login-acceptance-testsuite}/tests/idp-google.spec.ts | 0 .../login-acceptance-testsuite}/tests/idp-ldap.spec.ts | 0 .../login-acceptance-testsuite}/tests/idp-microsoft.spec.ts | 0 .../login-acceptance-testsuite}/tests/idp-saml.spec.ts | 0 .../tests/login-configuration-possiblities.spec.ts | 0 .../login-acceptance-testsuite}/tests/login.ts | 0 .../login-acceptance-testsuite}/tests/loginname-screen.ts | 0 .../login-acceptance-testsuite}/tests/loginname.ts | 0 .../login-acceptance-testsuite}/tests/passkey.ts | 0 .../login-acceptance-testsuite}/tests/password-screen.ts | 0 .../login-acceptance-testsuite}/tests/password.ts | 0 .../login-acceptance-testsuite}/tests/register-screen.ts | 0 .../login-acceptance-testsuite}/tests/register.spec.ts | 0 .../login-acceptance-testsuite}/tests/register.ts | 0 .../login-acceptance-testsuite}/tests/select-account.ts | 0 {acceptance => apps/login-acceptance-testsuite}/tests/sink.ts | 0 {acceptance => apps/login-acceptance-testsuite}/tests/user.ts | 0 .../tests/username-passkey.spec.ts | 0 .../tests/username-password-change-required.spec.ts | 0 .../tests/username-password-changed.spec.ts | 0 .../tests/username-password-otp_email.spec.ts | 0 .../tests/username-password-otp_sms.spec.ts | 0 .../tests/username-password-set.spec.ts | 0 .../tests/username-password-totp.spec.ts | 0 .../tests/username-password-u2f.spec.ts | 0 .../tests/username-password.spec.ts | 0 .../login-acceptance-testsuite}/tests/welcome.ts | 0 .../login-acceptance-testsuite}/tests/zitadel.ts | 0 {acceptance => apps/login-acceptance-testsuite}/zitadel.yaml | 0 apps/login-integration-testsuite/docker-compose.yaml | 4 ++-- 69 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 acceptance/pat/.gitignore rename {acceptance => apps/login-acceptance-testsuite}/Dockerfile (100%) rename {acceptance => apps/login-acceptance-testsuite}/docker-compose.yaml (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/oidc/docker-compose.yaml (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/oidc/go.mod (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/oidc/go.sum (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/oidc/main.go (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/saml/docker-compose.yaml (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/saml/go.mod (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/saml/go.sum (100%) rename {acceptance => apps/login-acceptance-testsuite}/idp/saml/main.go (100%) rename {acceptance => apps/login-acceptance-testsuite}/oidc/docker-compose.yaml (100%) rename {acceptance => apps/login-acceptance-testsuite}/oidc/go.mod (100%) rename {acceptance => apps/login-acceptance-testsuite}/oidc/go.sum (100%) rename {acceptance => apps/login-acceptance-testsuite}/oidc/main.go (100%) rename {acceptance => apps/login-acceptance-testsuite}/pat/.gitkeep (100%) rename {acceptance => apps/login-acceptance-testsuite}/saml/docker-compose.yaml (100%) rename {acceptance => apps/login-acceptance-testsuite}/saml/go.mod (100%) rename {acceptance => apps/login-acceptance-testsuite}/saml/go.sum (100%) rename {acceptance => apps/login-acceptance-testsuite}/saml/main.go (100%) rename {acceptance => apps/login-acceptance-testsuite}/setup.sh (100%) rename {acceptance => apps/login-acceptance-testsuite}/sink/go.mod (100%) rename {acceptance => apps/login-acceptance-testsuite}/sink/main.go (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/admin.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/code-screen.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/code.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/email-verify-screen.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/email-verify.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/email-verify.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-apple.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-generic-jwt.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-generic-oauth.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-generic-oidc.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-github-enterprise.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-github.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-gitlab-self-hosted.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-gitlab.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-google.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-ldap.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-microsoft.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/idp-saml.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/login-configuration-possiblities.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/login.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/loginname-screen.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/loginname.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/passkey.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/password-screen.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/password.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/register-screen.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/register.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/register.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/select-account.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/sink.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/user.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-passkey.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password-change-required.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password-changed.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password-otp_email.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password-otp_sms.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password-set.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password-totp.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password-u2f.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/username-password.spec.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/welcome.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/tests/zitadel.ts (100%) rename {acceptance => apps/login-acceptance-testsuite}/zitadel.yaml (100%) diff --git a/Makefile b/Makefile index 183384cd10..d973cf932f 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ login-help: @echo " login-unit - Run unit tests. FORCE=true prevents skipping." @echo " login-integration - Run integration tests. FORCE=true prevents skipping." @echo " login-standalone-build - Build the docker image for production login containers." - @echo " login-quality - Run all quality checks (login-lint, unit, integration)." + @echo " login-quality - Run all quality checks (login-lint, login-unit, login-integration)." @echo " login-ci - Run all CI tasks. Run it with the -j flag to parallelize: make -j ci." @echo " show-cache-keys - Show all cache keys with image ids and exit codes." @echo " clean-cache-keys - Remove all cache keys." diff --git a/acceptance/pat/.gitignore b/acceptance/pat/.gitignore deleted file mode 100644 index f0fa09f556..0000000000 --- a/acceptance/pat/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitkeep \ No newline at end of file diff --git a/apps/core-mock/Dockerfile b/apps/core-mock/Dockerfile index c9c77e5afd..469147d17d 100644 --- a/apps/core-mock/Dockerfile +++ b/apps/core-mock/Dockerfile @@ -6,4 +6,4 @@ COPY mocked-services.cfg . COPY initial-stubs initial-stubs COPY --from=protos . . -ENTRYPOINT [ "sh", "-c", "grpc-mock -v 1 -proto $(tr '\n' ',' < ./mocked-services.cfg) -stub-dir ./initial-stubs" ] +ENTRYPOINT [ "sh", "-c", "grpc-mock -v 1 -proto $(tr '\n' ',' < ./mocked-services.cfg) -stub-dir ./initial-stubs -mock-addr :22222" ] diff --git a/acceptance/Dockerfile b/apps/login-acceptance-testsuite/Dockerfile similarity index 100% rename from acceptance/Dockerfile rename to apps/login-acceptance-testsuite/Dockerfile diff --git a/acceptance/docker-compose.yaml b/apps/login-acceptance-testsuite/docker-compose.yaml similarity index 100% rename from acceptance/docker-compose.yaml rename to apps/login-acceptance-testsuite/docker-compose.yaml diff --git a/acceptance/idp/oidc/docker-compose.yaml b/apps/login-acceptance-testsuite/idp/oidc/docker-compose.yaml similarity index 100% rename from acceptance/idp/oidc/docker-compose.yaml rename to apps/login-acceptance-testsuite/idp/oidc/docker-compose.yaml diff --git a/acceptance/idp/oidc/go.mod b/apps/login-acceptance-testsuite/idp/oidc/go.mod similarity index 100% rename from acceptance/idp/oidc/go.mod rename to apps/login-acceptance-testsuite/idp/oidc/go.mod diff --git a/acceptance/idp/oidc/go.sum b/apps/login-acceptance-testsuite/idp/oidc/go.sum similarity index 100% rename from acceptance/idp/oidc/go.sum rename to apps/login-acceptance-testsuite/idp/oidc/go.sum diff --git a/acceptance/idp/oidc/main.go b/apps/login-acceptance-testsuite/idp/oidc/main.go similarity index 100% rename from acceptance/idp/oidc/main.go rename to apps/login-acceptance-testsuite/idp/oidc/main.go diff --git a/acceptance/idp/saml/docker-compose.yaml b/apps/login-acceptance-testsuite/idp/saml/docker-compose.yaml similarity index 100% rename from acceptance/idp/saml/docker-compose.yaml rename to apps/login-acceptance-testsuite/idp/saml/docker-compose.yaml diff --git a/acceptance/idp/saml/go.mod b/apps/login-acceptance-testsuite/idp/saml/go.mod similarity index 100% rename from acceptance/idp/saml/go.mod rename to apps/login-acceptance-testsuite/idp/saml/go.mod diff --git a/acceptance/idp/saml/go.sum b/apps/login-acceptance-testsuite/idp/saml/go.sum similarity index 100% rename from acceptance/idp/saml/go.sum rename to apps/login-acceptance-testsuite/idp/saml/go.sum diff --git a/acceptance/idp/saml/main.go b/apps/login-acceptance-testsuite/idp/saml/main.go similarity index 100% rename from acceptance/idp/saml/main.go rename to apps/login-acceptance-testsuite/idp/saml/main.go diff --git a/acceptance/oidc/docker-compose.yaml b/apps/login-acceptance-testsuite/oidc/docker-compose.yaml similarity index 100% rename from acceptance/oidc/docker-compose.yaml rename to apps/login-acceptance-testsuite/oidc/docker-compose.yaml diff --git a/acceptance/oidc/go.mod b/apps/login-acceptance-testsuite/oidc/go.mod similarity index 100% rename from acceptance/oidc/go.mod rename to apps/login-acceptance-testsuite/oidc/go.mod diff --git a/acceptance/oidc/go.sum b/apps/login-acceptance-testsuite/oidc/go.sum similarity index 100% rename from acceptance/oidc/go.sum rename to apps/login-acceptance-testsuite/oidc/go.sum diff --git a/acceptance/oidc/main.go b/apps/login-acceptance-testsuite/oidc/main.go similarity index 100% rename from acceptance/oidc/main.go rename to apps/login-acceptance-testsuite/oidc/main.go diff --git a/acceptance/pat/.gitkeep b/apps/login-acceptance-testsuite/pat/.gitkeep similarity index 100% rename from acceptance/pat/.gitkeep rename to apps/login-acceptance-testsuite/pat/.gitkeep diff --git a/acceptance/saml/docker-compose.yaml b/apps/login-acceptance-testsuite/saml/docker-compose.yaml similarity index 100% rename from acceptance/saml/docker-compose.yaml rename to apps/login-acceptance-testsuite/saml/docker-compose.yaml diff --git a/acceptance/saml/go.mod b/apps/login-acceptance-testsuite/saml/go.mod similarity index 100% rename from acceptance/saml/go.mod rename to apps/login-acceptance-testsuite/saml/go.mod diff --git a/acceptance/saml/go.sum b/apps/login-acceptance-testsuite/saml/go.sum similarity index 100% rename from acceptance/saml/go.sum rename to apps/login-acceptance-testsuite/saml/go.sum diff --git a/acceptance/saml/main.go b/apps/login-acceptance-testsuite/saml/main.go similarity index 100% rename from acceptance/saml/main.go rename to apps/login-acceptance-testsuite/saml/main.go diff --git a/acceptance/setup.sh b/apps/login-acceptance-testsuite/setup.sh similarity index 100% rename from acceptance/setup.sh rename to apps/login-acceptance-testsuite/setup.sh diff --git a/acceptance/sink/go.mod b/apps/login-acceptance-testsuite/sink/go.mod similarity index 100% rename from acceptance/sink/go.mod rename to apps/login-acceptance-testsuite/sink/go.mod diff --git a/acceptance/sink/main.go b/apps/login-acceptance-testsuite/sink/main.go similarity index 100% rename from acceptance/sink/main.go rename to apps/login-acceptance-testsuite/sink/main.go diff --git a/acceptance/tests/admin.spec.ts b/apps/login-acceptance-testsuite/tests/admin.spec.ts similarity index 100% rename from acceptance/tests/admin.spec.ts rename to apps/login-acceptance-testsuite/tests/admin.spec.ts diff --git a/acceptance/tests/code-screen.ts b/apps/login-acceptance-testsuite/tests/code-screen.ts similarity index 100% rename from acceptance/tests/code-screen.ts rename to apps/login-acceptance-testsuite/tests/code-screen.ts diff --git a/acceptance/tests/code.ts b/apps/login-acceptance-testsuite/tests/code.ts similarity index 100% rename from acceptance/tests/code.ts rename to apps/login-acceptance-testsuite/tests/code.ts diff --git a/acceptance/tests/email-verify-screen.ts b/apps/login-acceptance-testsuite/tests/email-verify-screen.ts similarity index 100% rename from acceptance/tests/email-verify-screen.ts rename to apps/login-acceptance-testsuite/tests/email-verify-screen.ts diff --git a/acceptance/tests/email-verify.spec.ts b/apps/login-acceptance-testsuite/tests/email-verify.spec.ts similarity index 100% rename from acceptance/tests/email-verify.spec.ts rename to apps/login-acceptance-testsuite/tests/email-verify.spec.ts diff --git a/acceptance/tests/email-verify.ts b/apps/login-acceptance-testsuite/tests/email-verify.ts similarity index 100% rename from acceptance/tests/email-verify.ts rename to apps/login-acceptance-testsuite/tests/email-verify.ts diff --git a/acceptance/tests/idp-apple.spec.ts b/apps/login-acceptance-testsuite/tests/idp-apple.spec.ts similarity index 100% rename from acceptance/tests/idp-apple.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-apple.spec.ts diff --git a/acceptance/tests/idp-generic-jwt.spec.ts b/apps/login-acceptance-testsuite/tests/idp-generic-jwt.spec.ts similarity index 100% rename from acceptance/tests/idp-generic-jwt.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-generic-jwt.spec.ts diff --git a/acceptance/tests/idp-generic-oauth.spec.ts b/apps/login-acceptance-testsuite/tests/idp-generic-oauth.spec.ts similarity index 100% rename from acceptance/tests/idp-generic-oauth.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-generic-oauth.spec.ts diff --git a/acceptance/tests/idp-generic-oidc.spec.ts b/apps/login-acceptance-testsuite/tests/idp-generic-oidc.spec.ts similarity index 100% rename from acceptance/tests/idp-generic-oidc.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-generic-oidc.spec.ts diff --git a/acceptance/tests/idp-github-enterprise.spec.ts b/apps/login-acceptance-testsuite/tests/idp-github-enterprise.spec.ts similarity index 100% rename from acceptance/tests/idp-github-enterprise.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-github-enterprise.spec.ts diff --git a/acceptance/tests/idp-github.spec.ts b/apps/login-acceptance-testsuite/tests/idp-github.spec.ts similarity index 100% rename from acceptance/tests/idp-github.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-github.spec.ts diff --git a/acceptance/tests/idp-gitlab-self-hosted.spec.ts b/apps/login-acceptance-testsuite/tests/idp-gitlab-self-hosted.spec.ts similarity index 100% rename from acceptance/tests/idp-gitlab-self-hosted.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-gitlab-self-hosted.spec.ts diff --git a/acceptance/tests/idp-gitlab.spec.ts b/apps/login-acceptance-testsuite/tests/idp-gitlab.spec.ts similarity index 100% rename from acceptance/tests/idp-gitlab.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-gitlab.spec.ts diff --git a/acceptance/tests/idp-google.spec.ts b/apps/login-acceptance-testsuite/tests/idp-google.spec.ts similarity index 100% rename from acceptance/tests/idp-google.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-google.spec.ts diff --git a/acceptance/tests/idp-ldap.spec.ts b/apps/login-acceptance-testsuite/tests/idp-ldap.spec.ts similarity index 100% rename from acceptance/tests/idp-ldap.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-ldap.spec.ts diff --git a/acceptance/tests/idp-microsoft.spec.ts b/apps/login-acceptance-testsuite/tests/idp-microsoft.spec.ts similarity index 100% rename from acceptance/tests/idp-microsoft.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-microsoft.spec.ts diff --git a/acceptance/tests/idp-saml.spec.ts b/apps/login-acceptance-testsuite/tests/idp-saml.spec.ts similarity index 100% rename from acceptance/tests/idp-saml.spec.ts rename to apps/login-acceptance-testsuite/tests/idp-saml.spec.ts diff --git a/acceptance/tests/login-configuration-possiblities.spec.ts b/apps/login-acceptance-testsuite/tests/login-configuration-possiblities.spec.ts similarity index 100% rename from acceptance/tests/login-configuration-possiblities.spec.ts rename to apps/login-acceptance-testsuite/tests/login-configuration-possiblities.spec.ts diff --git a/acceptance/tests/login.ts b/apps/login-acceptance-testsuite/tests/login.ts similarity index 100% rename from acceptance/tests/login.ts rename to apps/login-acceptance-testsuite/tests/login.ts diff --git a/acceptance/tests/loginname-screen.ts b/apps/login-acceptance-testsuite/tests/loginname-screen.ts similarity index 100% rename from acceptance/tests/loginname-screen.ts rename to apps/login-acceptance-testsuite/tests/loginname-screen.ts diff --git a/acceptance/tests/loginname.ts b/apps/login-acceptance-testsuite/tests/loginname.ts similarity index 100% rename from acceptance/tests/loginname.ts rename to apps/login-acceptance-testsuite/tests/loginname.ts diff --git a/acceptance/tests/passkey.ts b/apps/login-acceptance-testsuite/tests/passkey.ts similarity index 100% rename from acceptance/tests/passkey.ts rename to apps/login-acceptance-testsuite/tests/passkey.ts diff --git a/acceptance/tests/password-screen.ts b/apps/login-acceptance-testsuite/tests/password-screen.ts similarity index 100% rename from acceptance/tests/password-screen.ts rename to apps/login-acceptance-testsuite/tests/password-screen.ts diff --git a/acceptance/tests/password.ts b/apps/login-acceptance-testsuite/tests/password.ts similarity index 100% rename from acceptance/tests/password.ts rename to apps/login-acceptance-testsuite/tests/password.ts diff --git a/acceptance/tests/register-screen.ts b/apps/login-acceptance-testsuite/tests/register-screen.ts similarity index 100% rename from acceptance/tests/register-screen.ts rename to apps/login-acceptance-testsuite/tests/register-screen.ts diff --git a/acceptance/tests/register.spec.ts b/apps/login-acceptance-testsuite/tests/register.spec.ts similarity index 100% rename from acceptance/tests/register.spec.ts rename to apps/login-acceptance-testsuite/tests/register.spec.ts diff --git a/acceptance/tests/register.ts b/apps/login-acceptance-testsuite/tests/register.ts similarity index 100% rename from acceptance/tests/register.ts rename to apps/login-acceptance-testsuite/tests/register.ts diff --git a/acceptance/tests/select-account.ts b/apps/login-acceptance-testsuite/tests/select-account.ts similarity index 100% rename from acceptance/tests/select-account.ts rename to apps/login-acceptance-testsuite/tests/select-account.ts diff --git a/acceptance/tests/sink.ts b/apps/login-acceptance-testsuite/tests/sink.ts similarity index 100% rename from acceptance/tests/sink.ts rename to apps/login-acceptance-testsuite/tests/sink.ts diff --git a/acceptance/tests/user.ts b/apps/login-acceptance-testsuite/tests/user.ts similarity index 100% rename from acceptance/tests/user.ts rename to apps/login-acceptance-testsuite/tests/user.ts diff --git a/acceptance/tests/username-passkey.spec.ts b/apps/login-acceptance-testsuite/tests/username-passkey.spec.ts similarity index 100% rename from acceptance/tests/username-passkey.spec.ts rename to apps/login-acceptance-testsuite/tests/username-passkey.spec.ts diff --git a/acceptance/tests/username-password-change-required.spec.ts b/apps/login-acceptance-testsuite/tests/username-password-change-required.spec.ts similarity index 100% rename from acceptance/tests/username-password-change-required.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password-change-required.spec.ts diff --git a/acceptance/tests/username-password-changed.spec.ts b/apps/login-acceptance-testsuite/tests/username-password-changed.spec.ts similarity index 100% rename from acceptance/tests/username-password-changed.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password-changed.spec.ts diff --git a/acceptance/tests/username-password-otp_email.spec.ts b/apps/login-acceptance-testsuite/tests/username-password-otp_email.spec.ts similarity index 100% rename from acceptance/tests/username-password-otp_email.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password-otp_email.spec.ts diff --git a/acceptance/tests/username-password-otp_sms.spec.ts b/apps/login-acceptance-testsuite/tests/username-password-otp_sms.spec.ts similarity index 100% rename from acceptance/tests/username-password-otp_sms.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password-otp_sms.spec.ts diff --git a/acceptance/tests/username-password-set.spec.ts b/apps/login-acceptance-testsuite/tests/username-password-set.spec.ts similarity index 100% rename from acceptance/tests/username-password-set.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password-set.spec.ts diff --git a/acceptance/tests/username-password-totp.spec.ts b/apps/login-acceptance-testsuite/tests/username-password-totp.spec.ts similarity index 100% rename from acceptance/tests/username-password-totp.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password-totp.spec.ts diff --git a/acceptance/tests/username-password-u2f.spec.ts b/apps/login-acceptance-testsuite/tests/username-password-u2f.spec.ts similarity index 100% rename from acceptance/tests/username-password-u2f.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password-u2f.spec.ts diff --git a/acceptance/tests/username-password.spec.ts b/apps/login-acceptance-testsuite/tests/username-password.spec.ts similarity index 100% rename from acceptance/tests/username-password.spec.ts rename to apps/login-acceptance-testsuite/tests/username-password.spec.ts diff --git a/acceptance/tests/welcome.ts b/apps/login-acceptance-testsuite/tests/welcome.ts similarity index 100% rename from acceptance/tests/welcome.ts rename to apps/login-acceptance-testsuite/tests/welcome.ts diff --git a/acceptance/tests/zitadel.ts b/apps/login-acceptance-testsuite/tests/zitadel.ts similarity index 100% rename from acceptance/tests/zitadel.ts rename to apps/login-acceptance-testsuite/tests/zitadel.ts diff --git a/acceptance/zitadel.yaml b/apps/login-acceptance-testsuite/zitadel.yaml similarity index 100% rename from acceptance/zitadel.yaml rename to apps/login-acceptance-testsuite/zitadel.yaml diff --git a/apps/login-integration-testsuite/docker-compose.yaml b/apps/login-integration-testsuite/docker-compose.yaml index 96d3fc9b59..4dbed31961 100644 --- a/apps/login-integration-testsuite/docker-compose.yaml +++ b/apps/login-integration-testsuite/docker-compose.yaml @@ -16,13 +16,13 @@ services: - ZITADEL_SERVICE_USER_TOKEN="yolo" - EMAIL_VERIFICATION=true - DEBUG=true - - NEXT_PUBLIC_BASE_PATH="" + - NEXT_PUBLIC_BASE_PATH="/ui/v2/login" integration-testsuite: image: ${LOGIN_INTEGRATION_TESTSUITE_TAG:-zitadel-login-integration-testsuite:local} container_name: integration-testsuite environment: - - LOGIN_BASE_URL=http://login:3000 + - LOGIN_BASE_URL=http://login:3000/ui/v2/login - CYPRESS_CORE_MOCK_STUBS_URL=http://core-mock:22220/v1/stubs depends_on: login: