diff --git a/scripts/e2e.config.ts b/scripts/e2e.config.ts index dc10e32f7a..bbaefd863b 100644 --- a/scripts/e2e.config.ts +++ b/scripts/e2e.config.ts @@ -199,6 +199,7 @@ export default { // One server holds every test's state, and a dev stack is heavy. workers: 1, timeout: 300_000, + launchTimeout: 180_000, assertionTimeout: 15_000, video: "on", trace: "on", diff --git a/scripts/scenarios/start-app.ts b/scripts/scenarios/start-app.ts index 63f9cb9ddd..44b0065a8e 100644 --- a/scripts/scenarios/start-app.ts +++ b/scripts/scenarios/start-app.ts @@ -63,6 +63,13 @@ export const prepareHome = Effect.fn("startApp.prepareHome")(function* (home: st yield* fs.writeFileString(shim, HOST_LABEL_SHIM); yield* fs.chmod(shim, 0o755); } + const hostEnv = yield* HostProcess.Environment; + if (hostEnv.T3_SCENARIO_CONNECT_TOKEN_FILE) { + const secrets = path.join(home, "userdata/secrets"); + yield* fs.makeDirectory(secrets, { recursive: true }); + yield* fs.copyFile(hostEnv.T3_SCENARIO_CONNECT_TOKEN_FILE, path.join(secrets, "cloud-cli-oauth-token.bin")); + yield* fs.writeFileString(path.join(secrets, "cloud-cli-desired-link.bin"), "managed"); + } const noModel = path.join(home, "bin/no-model"); yield* fs.writeFileString(noModel, "#!/bin/sh\necho 'scenarios run no model' >&2\nexit 1\n"); yield* fs.chmod(noModel, 0o755); @@ -131,6 +138,11 @@ const startApp = Effect.fn("startApp")(function* (input: { PATH: `${path.join(input.home, "bin")}:${hostEnvironment.PATH ?? ""}`, T3CODE_AUTO_BOOTSTRAP_PROJECT_FROM_CWD: "0", }; + if (hostEnvironment.T3_SCENARIO_CONNECT_TOKEN_FILE) { + const build = yield* start({ cwd: path.join(checkout, "apps/web"), command: "vp", args: ["run", "build"], env, onLine: Console.log }); + const code = yield* build.exitCode; + if (code !== 0) return yield* new ScenarioError({ message: "The relay web build failed." }); + } const devRunner = (mode: string, args: ReadonlyArray) => [ "scripts/dev-runner.ts", mode, @@ -160,6 +172,9 @@ const startApp = Effect.fn("startApp")(function* (input: { T3CODE_DEV_AUTH_TOKEN: `${token}${token}`.replaceAll("-", ""), }, onLine: (line) => { + if (line.includes("T3 Connect is reachable from other devices.")) { + return fs.writeFileString(path.join(input.home, "relay-ready"), "ready").pipe(Effect.andThen(Console.log(line))); + } const url = /pairingUrl:\s*(\S+)/.exec(line)?.[1]; if (url === undefined) return Console.log(line); // The link is a credential: it goes to a file the tests read, never to the log.