This commit is contained in:
Elio Bischof
2025-07-31 05:57:52 +02:00
parent b400b1b42c
commit 90dc64a2bb
6 changed files with 10 additions and 11 deletions

View File

@@ -12,7 +12,8 @@ services:
environment: environment:
ZITADEL_DATABASE_POSTGRES_HOST: db ZITADEL_DATABASE_POSTGRES_HOST: db
ZITADEL_EXTERNALSECURE: false ZITADEL_EXTERNALSECURE: false
DISPLAY: ' '
db: db:
container_name: db container_name: db
image: postgres:17.0-alpine3.19 image: postgres:17.0-alpine3.19

View File

@@ -15,6 +15,6 @@
22222, 22222,
3001 3001
], ],
"onCreateCommand": "pnpm --filter @zitadel/login install --frozen-lockfile; pnpm --filter @zitadel/login exec cypress install", "onCreateCommand": "pnpm --filter @zitadel/login install --frozen-lockfile --dev; pnpm --filter @zitadel/login exec cypress install",
"updateContentCommand": "pnpm --filter @zitadel/login test:integration:login" "updateContentCommand": "pnpm --filter @zitadel/login test:integration:login"
} }

View File

@@ -10,15 +10,13 @@
"runServices": [ "runServices": [
"login-integration" "login-integration"
], ],
"workspaceFolder": "/workspaces", "workspaceFolder": "/workspaces/apps/login",
"forwardPorts": [ "forwardPorts": [
22220, 22220,
22222, 22222,
3001 3001
], ],
"onCreateCommand": "pnpm install --filter . --filter @zitadel/login; cd apps/login; pnpm cypress install", "onCreateCommand": "pnpm install --frozen-lockfile --filter @zitadel/login --filter @zitadel/client --filter @zitadel/proto --filter ../..",
"postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo watch @zitadel/login#dev test:integration:login", "postStartCommand": "pnpm turbo daemon clean || true; (pnpm turbo @zitadel/login#dev&)",
"features": { "postAttachCommand": "echo 'THANKS FOR CONTRIBUTING TO ZITADEL!'; echo; echo; echo 'The login is running in hot reloading dev mode'; echo 'Run a specific test file like this:'; echo; echo 'pnpm cypress run --spec integration/login.cy.ts'; echo; echo 'Navigate to the page you want to fix at http://localhost:3001'; echo 'Change the code and reload the page to see the effects'; echo 'Repeat until all tests pass:'; echo; echo 'pnpm cypress run'"
"ghcr.io/devcontainers/features/docker-outside-of-docker": {}
}
} }

View File

@@ -3,7 +3,7 @@ services:
container_name: login-integration-debug container_name: login-integration-debug
network_mode: service:mock-zitadel network_mode: service:mock-zitadel
extends: extends:
file: ../login-integration-ci/docker-compose.yaml file: ../base/docker-compose.yaml
service: devcontainer service: devcontainer
mock-zitadel: mock-zitadel:

View File

@@ -77,6 +77,6 @@ jobs:
targets: login-standalone targets: login-standalone
files: | files: |
./apps/login/docker-bake.hcl ./apps/login/docker-bake.hcl
./apps/login/docker-bake-release.hcl ${{ github.event_name == 'workflow_dispatch' && './apps/login/docker-bake-release.hcl' || '' }}
./docker-bake.hcl ./docker-bake.hcl
cwd://${{ steps.login-meta.outputs.bake-file }} cwd://${{ steps.login-meta.outputs.bake-file }}

View File

@@ -15,7 +15,7 @@
"test:unit": "vitest --run", "test:unit": "vitest --run",
"lint-staged": "lint-staged", "lint-staged": "lint-staged",
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
"test:integration:login": "wait-on --simultaneous 1 http://localhost:3001/ui/v2/login/verify?userId=221394658884845598&code=abc && DISPLAY='' cypress run", "test:integration:login": "wait-on --simultaneous 1 http://localhost:3001/ui/v2/login/verify?userId=221394658884845598&code=abc && cypress run",
"test:acceptance": "dotenv -e ../login/.env.test.local playwright", "test:acceptance": "dotenv -e ../login/.env.test.local playwright",
"test:acceptance:setup": "cd ../.. && make login_test_acceptance_setup_env && NODE_ENV=test turbo run test:acceptance:setup:dev", "test:acceptance:setup": "cd ../.. && make login_test_acceptance_setup_env && NODE_ENV=test turbo run test:acceptance:setup:dev",
"test:acceptance:setup:dev": "cd ../.. && make login_test_acceptance_setup_dev" "test:acceptance:setup:dev": "cd ../.. && make login_test_acceptance_setup_dev"