From 76ece7549eb2eb0f1f89682718506dcf017738d1 Mon Sep 17 00:00:00 2001
From: Edmund Hung <edmund@cloudflare.com>
Date: Tue, 17 Sep 2024 16:20:42 +0100
Subject: [PATCH] chore: improve c3 tests (#6734)

---
 .../e2e-tests/frameworks.test.ts              | 13 ++-------
 .../src/__tests__/deploy.test.ts              | 29 ++++++++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/packages/create-cloudflare/e2e-tests/frameworks.test.ts b/packages/create-cloudflare/e2e-tests/frameworks.test.ts
index 5e81b21fef42..46c1e854dde7 100644
--- a/packages/create-cloudflare/e2e-tests/frameworks.test.ts
+++ b/packages/create-cloudflare/e2e-tests/frameworks.test.ts
@@ -660,20 +660,13 @@ const verifyBuildCfTypesScript = async (
 	const outputFileContentPost = readFile(join(projectPath, outputFile));
 	const outputFileContentPostLines = outputFileContentPost.split("\n");
 
+	// the file doesn't contain the "Generated by Wrangler" comment anymore
+	expect(outputFileContentPostLines).not.toContain("// Generated by Wrangler");
+
 	// the file still contains the env interface
 	expect(outputFileContentPostLines).toContain(
 		`interface ${envInterfaceName} {`,
 	);
-
-	// the file doesn't contain the "Generated by Wrangler" comment without a timestamp anymore
-	expect(outputFileContentPostLines).not.toContain("// Generated by Wrangler");
-
-	// but it contains the "Generated by Wrangler" comment now with a timestamp
-	expect(
-		/\/\/ Generated by Wrangler on [a-zA-Z]*? [a-zA-Z]*? \d{2} \d{4} \d{2}:\d{2}:\d{2}/.test(
-			outputFileContentPost,
-		),
-	).toBeTruthy();
 };
 
 const verifyBuildScript = async (
diff --git a/packages/create-cloudflare/src/__tests__/deploy.test.ts b/packages/create-cloudflare/src/__tests__/deploy.test.ts
index 232a206a2000..f4abea2ec485 100644
--- a/packages/create-cloudflare/src/__tests__/deploy.test.ts
+++ b/packages/create-cloudflare/src/__tests__/deploy.test.ts
@@ -1,5 +1,5 @@
 import { crash } from "@cloudflare/cli";
-import { processArgument } from "@cloudflare/cli/args";
+import { inputPrompt } from "@cloudflare/cli/interactive";
 import { mockPackageManager, mockSpinner } from "helpers/__tests__/mocks";
 import { runCommand } from "helpers/command";
 import { readFile } from "helpers/files";
@@ -10,7 +10,6 @@ import { createTestContext } from "./helpers";
 
 vi.mock("helpers/command");
 vi.mock("../wrangler/accounts");
-vi.mock("@cloudflare/cli/args");
 vi.mock("@cloudflare/cli/interactive");
 vi.mock("which-pm-runs");
 vi.mock("@cloudflare/cli");
@@ -33,8 +32,16 @@ const mockInsideGitRepo = (isInside = true) => {
 describe("deploy helpers", async () => {
 	beforeEach(() => {
 		mockPackageManager("npm");
-
 		mockSpinner();
+		vi.mocked(inputPrompt).mockImplementation(async (options) => {
+			if (options.acceptDefault) {
+				return options.defaultValue;
+			}
+
+			throw new Error(
+				"If you don't want to accept the default, you must mock this function.",
+			);
+		});
 	});
 
 	describe("offerToDeploy", async () => {
@@ -42,7 +49,7 @@ describe("deploy helpers", async () => {
 			const ctx = createTestContext();
 			ctx.template.platform = "pages";
 			// mock the user selecting yes when asked to deploy
-			vi.mocked(processArgument).mockResolvedValueOnce(true);
+			vi.mocked(inputPrompt).mockResolvedValueOnce(true);
 			// mock a successful wrangler login
 			vi.mocked(wranglerLogin).mockResolvedValueOnce(true);
 
@@ -55,7 +62,7 @@ describe("deploy helpers", async () => {
 			vi.mocked(readFile).mockReturnValue(`binding = "MY_QUEUE"`);
 
 			await expect(offerToDeploy(ctx)).resolves.toBe(false);
-			expect(processArgument).toHaveBeenCalledOnce();
+			expect(inputPrompt).toHaveBeenCalledOnce();
 			expect(ctx.args.deploy).toBe(false);
 			expect(wranglerLogin).not.toHaveBeenCalled();
 		});
@@ -72,7 +79,7 @@ describe("deploy helpers", async () => {
 			`);
 
 			await expect(offerToDeploy(ctx)).resolves.toBe(false);
-			expect(processArgument).toHaveBeenCalledOnce();
+			expect(inputPrompt).toHaveBeenCalledOnce();
 			expect(ctx.args.deploy).toBe(false);
 			expect(wranglerLogin).not.toHaveBeenCalled();
 		});
@@ -83,13 +90,13 @@ describe("deploy helpers", async () => {
 				experimental_assets = { directory = "./dist", binding = "ASSETS" }
 			`);
 			// mock the user selecting yes when asked to deploy
-			vi.mocked(processArgument).mockResolvedValueOnce(true);
+			vi.mocked(inputPrompt).mockResolvedValueOnce(true);
 			// mock a successful wrangler login
 			vi.mocked(wranglerLogin).mockResolvedValueOnce(true);
 
 			await expect(offerToDeploy(ctx)).resolves.toBe(true);
-			expect(processArgument).toHaveBeenCalledOnce();
-			expect(ctx.args.deploy).toBe(false);
+			expect(inputPrompt).toHaveBeenCalledOnce();
+			expect(ctx.args.deploy).toBe(true);
 			expect(wranglerLogin).toHaveBeenCalled();
 		});
 
@@ -99,7 +106,7 @@ describe("deploy helpers", async () => {
 			ctx.template.platform = "pages";
 
 			await expect(offerToDeploy(ctx)).resolves.toBe(false);
-			expect(processArgument).toHaveBeenCalledOnce();
+			expect(inputPrompt).toHaveBeenCalledOnce();
 			expect(ctx.args.deploy).toBe(false);
 			expect(wranglerLogin).not.toHaveBeenCalled();
 		});
@@ -107,7 +114,7 @@ describe("deploy helpers", async () => {
 		test("wrangler login failure", async () => {
 			const ctx = createTestContext();
 			ctx.template.platform = "pages";
-			vi.mocked(processArgument).mockResolvedValueOnce(true);
+			vi.mocked(inputPrompt).mockResolvedValueOnce(true);
 			vi.mocked(wranglerLogin).mockResolvedValueOnce(false);
 
 			await expect(offerToDeploy(ctx)).resolves.toBe(false);