cleanup the e2e test for the unenv preset (#10053)

Co-authored-by: Pete Bacon Darwin <[email protected]>

Author: vicb

packages/wrangler/e2e/deployments.test.ts

@@ -68,14 +68,11 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
 			assert(match?.groups);
 			deployedUrl = match.groups.url;
 
-			const { text } = await retry(
-				(s) => s.status !== 200,
-				async () => {
-					const r = await fetch(deployedUrl);
-					return { text: await r.text(), status: r.status };
-				}
+			const response = await retry(
+				(resp) => !resp.ok,
+				async () => await fetch(deployedUrl)
 			);
-			expect(text).toMatchInlineSnapshot('"Hello World!"');
+			await expect(response.text()).resolves.toEqual("Hello World!");
 		});
 
 		it("lists 1 deployment", async () => {
@@ -110,14 +107,11 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
 			assert(match?.groups);
 			deployedUrl = match.groups.url;
 
-			const { text } = await retry(
-				(s) => s.status !== 200 || s.text === "Hello World!",
-				async () => {
-					const r = await fetch(deployedUrl);
-					return { text: await r.text(), status: r.status };
-				}
+			const response = await retry(
+				(resp) => !resp.ok,
+				async () => await fetch(deployedUrl)
 			);
-			expect(text).toMatchInlineSnapshot('"Updated Worker!"');
+			await expect(response.text()).resolves.toEqual("Updated Worker!");
 		});
 
 		it("lists 2 deployments", async () => {

packages/wrangler/e2e/provision.test.ts

@@ -117,14 +117,11 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
 			assert(d1Match?.groups);
 			d1Id = d1Match.groups.d1;
 
-			const { text } = await retry(
-				(s) => s.status !== 200,
-				async () => {
-					const r = await fetch(deployedUrl);
-					return { text: await r.text(), status: r.status };
-				}
+			const response = await retry(
+				(resp) => !resp.ok,
+				async () => await fetch(deployedUrl)
 			);
-			expect(text).toMatchInlineSnapshot('"Hello World!"');
+			await expect(response.text()).resolves.toEqual("Hello World!");
 		});
 
 		it("can inherit bindings on re-deploy and won't re-provision", async () => {
@@ -144,14 +141,11 @@ describe.skipIf(!CLOUDFLARE_ACCOUNT_ID)(
 			Current Version ID: 00000000-0000-0000-0000-000000000000"
 		`);
 
-			const { text } = await retry(
-				(s) => s.status !== 200,
-				async () => {
-					const r = await fetch(deployedUrl);
-					return { text: await r.text(), status: r.status };
-				}
+			const response = await retry(
+				(resp) => !resp.ok,
+				async () => await fetch(deployedUrl)
 			);
-			expect(text).toMatchInlineSnapshot('"Hello World!"');
+			await expect(response.text()).resolves.toEqual("Hello World!");
 		});
 
 		it("can inherit and provision resources on version upload", async () => {

packages/wrangler/e2e/unenv-preset/local.test.ts

@@ -0,0 +1,70 @@
+import { join } from "node:path";
+import { fetch } from "undici";
+import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
+import { formatCompatibilityDate } from "../../src/utils/compatibility-date";
+import { WranglerE2ETestHelper } from "../helpers/e2e-wrangler-test";
+import { generateResourceName } from "../helpers/generate-resource-name";
+import { retry } from "../helpers/retry";
+import { TESTS } from "./worker/index";
+import type { WranglerLongLivedCommand } from "../helpers/wrangler";
+
+describe(`@cloudflare/unenv-preset tests`, () => {
+	let helper: WranglerE2ETestHelper;
+
+	beforeAll(async () => {
+		helper = new WranglerE2ETestHelper();
+		await helper.seed({
+			"wrangler.jsonc": JSON.stringify({
+				name: generateResourceName(),
+				main: join(__dirname, "/worker/index.ts"),
+				compatibility_date: formatCompatibilityDate(new Date()),
+				compatibility_flags: ["nodejs_compat"],
+				vars: {
+					DEBUG: "example",
+				},
+			}),
+		});
+	});
+
+	// Run the tests on:
+	// - the "local" runtime installed in miniflare
+	// - the "remote" runtime available in Cloudflare prod
+	//
+	// The "local" and "remote" runtimes do not necessarily use the exact same version
+	// of workerd and we want to make sure the preset works for both.
+	describe.for(["local", "remote"])("%s tests", (localOrRemote) => {
+		let url: string;
+		let wrangler: WranglerLongLivedCommand;
+		beforeAll(async () => {
+			wrangler = helper.runLongLived(`wrangler dev --${localOrRemote}`, {
+				stopOnTestFinished: false,
+			});
+			url = (await wrangler.waitForReady()).url;
+
+			// Wait for the Worker to be actually responding.
+			const response = await retry(
+				(resp) => !resp.ok,
+				async () => await fetch(`${url}/ping`)
+			);
+			await expect(response.text()).resolves.toEqual("pong");
+		});
+
+		afterAll(async () => {
+			await wrangler.stop();
+		});
+
+		test.for(Object.keys(TESTS))(
+			"%s",
+			{ timeout: 20_000 },
+			async (testName) => {
+				// Retries the callback until it succeeds or times out.
+				// Useful for the i.e. DNS tests where underlying requests might error/timeout.
+				await vi.waitFor(async () => {
+					const response = await fetch(`${url}/${testName}`);
+					const body = await response.text();
+					expect(body).toMatch("OK!");
+				});
+			}
+		);
+	});
+});

packages/wrangler/e2e/unenv-preset/preset.test.ts

@@ -20,7 +20,6 @@ export default {
 		const url = new URL(request.url);
 		const testName = url.pathname.slice(1);
 		if (testName === "ping") {
-			// Used by the deploy test to know when the worker is online
 			return new Response("pong");
 		}
 		const test = TESTS[testName];