diff --git a/.devcontainer/login-integration-debug/devcontainer.json b/.devcontainer/login-integration-debug/devcontainer.json index 99d350d50c..9bed28b7a6 100644 --- a/.devcontainer/login-integration-debug/devcontainer.json +++ b/.devcontainer/login-integration-debug/devcontainer.json @@ -9,10 +9,10 @@ "runServices": [ "login-integration" ], - "workspaceFolder": "/workspaces/apps/login", + "workspaceFolder": "/workspaces", "forwardPorts": [ 3001 ], - "onCreateCommand": "pnpm install && pnpm cypress install", - "postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo test:integration:login" + "onCreateCommand": "pnpm install --filter . --filter @zitadel/login; cd apps/login; pnpm cypress install", + "postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo watch test:integration:login" } \ No newline at end of file diff --git a/.devcontainer/login-integration-debug/docker-compose.yml b/.devcontainer/login-integration-debug/docker-compose.yml index 23896a8aea..7dce25157e 100644 --- a/.devcontainer/login-integration-debug/docker-compose.yml +++ b/.devcontainer/login-integration-debug/docker-compose.yml @@ -4,7 +4,4 @@ services: extends: file: ../base/docker-compose.yml service: devcontainer - build: - context: ../base - dockerfile: !reset "" network_mode: !reset "" diff --git a/.devcontainer/login-integration/devcontainer.json b/.devcontainer/login-integration/devcontainer.json index 8126c26612..7ce0396369 100644 --- a/.devcontainer/login-integration/devcontainer.json +++ b/.devcontainer/login-integration/devcontainer.json @@ -8,10 +8,10 @@ "runServices": [ "login-integration" ], - "workspaceFolder": "/workspaces/apps/login", + "workspaceFolder": "/workspaces", "forwardPorts": [ 3001 ], - "onCreateCommand": "pnpm install --frozen-lockfile && pnpm cypress install", - "postAttachCommand": "pnpm test:integration:login" + "onCreateCommand": "pnpm install --frozen-lockfile --filter . --filter @zitadel/login; cd apps/login; pnpm cypress install", + "postAttachCommand": "cd apps/login; pnpm test:integration:login" } \ No newline at end of file diff --git a/apps/login/package.json b/apps/login/package.json index ab04b5a65e..4681049a22 100644 --- a/apps/login/package.json +++ b/apps/login/package.json @@ -15,7 +15,7 @@ "test:unit": "vitest --run", "lint-staged": "lint-staged", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next", - "test:integration:login": "wait-on http://localhost:3001/ui/v2/login/healthy && DISPLAY='' cypress run", + "test:integration:login": "wait-on http://localhost:3001/ui/v2/login/verify && DISPLAY='' cypress run", "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:dev": "cd ../.. && make login_test_acceptance_setup_dev" diff --git a/apps/login/turbo.json b/apps/login/turbo.json index 7fff42370c..fc534b9576 100644 --- a/apps/login/turbo.json +++ b/apps/login/turbo.json @@ -49,10 +49,7 @@ "outputs": [ "cypress/videos/**", "cypress/screenshots/**" - ], - "with": [ - "dev" ] } } -} +} \ No newline at end of file