diff --git a/.devcontainer/login-integration-debug/devcontainer.json b/.devcontainer/login-integration-debug/devcontainer.json index 34713acf5f..3303138bb2 100644 --- a/.devcontainer/login-integration-debug/devcontainer.json +++ b/.devcontainer/login-integration-debug/devcontainer.json @@ -14,7 +14,7 @@ 3001 ], "onCreateCommand": "pnpm install --recursive", - "postAttachCommand": "pnpm turbo daemon clean; pnpm turbo @zitadel/login#dev test:integration:login:debug", + "postAttachCommand": "pnpm turbo daemon clean || true; pnpm turbo test:integration:login:debug", "customizations": { "jetbrains": { "settings": { diff --git a/apps/login/package.json b/apps/login/package.json index 0d084781a2..fd5f4a4380 100644 --- a/apps/login/package.json +++ b/apps/login/package.json @@ -15,8 +15,8 @@ "test:unit": "vitest --run", "lint-staged": "lint-staged", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next", - "test:integration:login": "cypress run", - "test:integration:login:debug": "cypress open", + "test:integration:login": "DISPLAY='' cypress run", + "test:integration:login:debug": "DISPLAY=:0 cypress open", "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 b7b4e5fd27..58d5ad6891 100644 --- a/apps/login/turbo.json +++ b/apps/login/turbo.json @@ -1,22 +1,51 @@ { - "extends": ["//"], + "extends": [ + "//" + ], "tasks": { "build": { - "outputs": ["dist/**", ".next/**", "!.next/cache/**"], - "dependsOn": ["@zitadel/client#build"] + "outputs": [ + "dist/**", + ".next/**", + "!.next/cache/**" + ], + "dependsOn": [ + "@zitadel/client#build" + ] }, "build:login:standalone": { - "outputs": ["dist/**", ".next/**", "!.next/cache/**"], - "dependsOn": ["@zitadel/client#build"] + "outputs": [ + "dist/**", + ".next/**", + "!.next/cache/**" + ], + "dependsOn": [ + "@zitadel/client#build" + ] }, "dev": { - "dependsOn": ["@zitadel/client#build"] + "persistent": true, + "cache": false, + "dependsOn": [ + "@zitadel/client#build" + ] }, "test": { - "dependsOn": ["@zitadel/client#build"] + "dependsOn": [ + "@zitadel/client#build" + ] }, "test:unit": { - "dependsOn": ["@zitadel/client#build"] + "dependsOn": [ + "@zitadel/client#build" + ] + }, + "test:integration:login:debug": { + "persistent": true, + "cache": false, + "with": [ + "dev" + ] } } -} +} \ No newline at end of file diff --git a/packages/zitadel-proto/package.json b/packages/zitadel-proto/package.json index 639b414792..bb47e36c8d 100644 --- a/packages/zitadel-proto/package.json +++ b/packages/zitadel-proto/package.json @@ -23,4 +23,4 @@ "devDependencies": { "@bufbuild/buf": "^1.53.0" } -} +} \ No newline at end of file diff --git a/turbo.json b/turbo.json index 2dad100d23..d4f6062e89 100644 --- a/turbo.json +++ b/turbo.json @@ -1,7 +1,9 @@ { "$schema": "https://turbo.build/schema.json", "ui": "tui", - "globalDependencies": ["**/.env.*local"], + "globalDependencies": [ + "**/.env.*local" + ], "globalEnv": [ "DEBUG", "VERCEL_URL", @@ -36,6 +38,7 @@ }, "start": {}, "test:unit": {}, + "test:integration:login": {}, "test:acceptance": {}, "test:e2e": {}, "lint": {}, @@ -48,4 +51,4 @@ "cache": false } } -} +} \ No newline at end of file