diff --git a/packages/create-cloudflare/e2e-tests/cli.test.ts b/packages/create-cloudflare/e2e-tests/cli.test.ts index 72b44ed1e822..8c8b44805858 100644 --- a/packages/create-cloudflare/e2e-tests/cli.test.ts +++ b/packages/create-cloudflare/e2e-tests/cli.test.ts @@ -6,13 +6,10 @@ import { version } from "../package.json"; import { keys, runC3 } from "./helpers"; describe("E2E: Basic C3 functionality", () => { - let tmpDirPath: string; - let projectPath: string; + const tmpDirPath = realpathSync(mkdtempSync(join(tmpdir(), "c3-tests"))); + const projectPath = join(tmpDirPath, "basic-tests"); beforeEach(() => { - tmpDirPath = realpathSync(mkdtempSync(join(tmpdir(), "c3-tests"))); - - projectPath = join(tmpDirPath, "basic-tests"); rmSync(projectPath, { recursive: true, force: true }); }); diff --git a/packages/create-cloudflare/e2e-tests/helpers.ts b/packages/create-cloudflare/e2e-tests/helpers.ts index 932db627d403..ea54175a166b 100644 --- a/packages/create-cloudflare/e2e-tests/helpers.ts +++ b/packages/create-cloudflare/e2e-tests/helpers.ts @@ -25,7 +25,7 @@ export const runC3 = async ({ promptHandlers = [], }: RunnerConfig) => { const proc = spawn("node", ["./dist/cli.js", ...argv]); - const output: string[] = []; + const stdout: string[] = []; const stderr: string[] = []; await new Promise((resolve, rejects) => { @@ -34,7 +34,7 @@ export const runC3 = async ({ const currentDialog = promptHandlers[0]; lines.forEach((line) => { - output.push(line); + stdout.push(line); if (currentDialog && currentDialog.matcher.test(line)) { currentDialog.input.forEach((keystroke) => { @@ -71,7 +71,7 @@ export const runC3 = async ({ }); return { - output: output.join("\n").trim(), - stderr: stderr.join("\n").trim(), + output: stdout.join("\n").trim(), + errors: stderr.join("\n").trim(), }; }; diff --git a/packages/create-cloudflare/e2e-tests/pages.test.ts b/packages/create-cloudflare/e2e-tests/pages.test.ts index 9838f7e57088..b4b6382b136e 100644 --- a/packages/create-cloudflare/e2e-tests/pages.test.ts +++ b/packages/create-cloudflare/e2e-tests/pages.test.ts @@ -14,13 +14,10 @@ Areas for future improvement: */ describe("E2E: Web frameworks", () => { - let tmpDirPath: string; - let projectPath: string; + const tmpDirPath = realpathSync(mkdtempSync(join(tmpdir(), "c3-tests"))); + const projectPath = join(tmpDirPath, "pages-tests"); beforeEach(() => { - tmpDirPath = realpathSync(mkdtempSync(join(tmpdir(), "c3-tests"))); - - projectPath = join(tmpDirPath, "pages-tests"); rmSync(projectPath, { recursive: true, force: true }); }); diff --git a/packages/create-cloudflare/e2e-tests/workers.test.ts b/packages/create-cloudflare/e2e-tests/workers.test.ts index 1ab802f241d4..e359d3383e17 100644 --- a/packages/create-cloudflare/e2e-tests/workers.test.ts +++ b/packages/create-cloudflare/e2e-tests/workers.test.ts @@ -11,13 +11,10 @@ Areas for future improvement: */ describe("E2E: Workers templates", () => { - let tmpDirPath: string; - let projectPath: string; + const tmpDirPath = realpathSync(mkdtempSync(join(tmpdir(), "workers-tests"))); + const projectPath = join(tmpDirPath, "pages-tests"); beforeEach(() => { - tmpDirPath = realpathSync(mkdtempSync(join(tmpdir(), "workers-tests"))); - - projectPath = join(tmpDirPath, "pages-tests"); rmSync(projectPath, { recursive: true, force: true }); }); diff --git a/packages/create-cloudflare/src/helpers/command.ts b/packages/create-cloudflare/src/helpers/command.ts index 633bec8a5198..535b1ba8584c 100644 --- a/packages/create-cloudflare/src/helpers/command.ts +++ b/packages/create-cloudflare/src/helpers/command.ts @@ -70,7 +70,7 @@ export const runCommand = async ( let output = ``; - if (opts?.captureOutput ?? opts.silent) { + if (opts.captureOutput ?? opts.silent) { cmd.stdout?.on("data", (data) => { output += data; });