Edge preview authentication proxy - retry failed tests (#12751)

Author: petebacondarwin

packages/edge-preview-authenticated-proxy/tests/index.test.ts

@@ -18,9 +18,15 @@ function createMockFetchImplementation() {
 		const request = new Request(input, init);
 		const url = new URL(request.url);
 
+		if (url.origin === "https://workers-logging.cfdata.org") {
+			// Ignore prometheus logging requests
+			return new Response("OK", { status: 200 });
+		}
+
 		// Only intercept requests to our mock remote URL
 		if (url.origin !== MOCK_REMOTE_URL) {
-			return new Response("OK", { status: 200 });
+			console.error(`Request to unexpected URL: ${request.url}`);
+			return new Response("BAD", { status: 500 });
 		}
 
 		if (url.pathname === "/exchange") {
@@ -80,8 +86,6 @@ afterEach(() => {
 });
 
 describe("Preview Worker", () => {
-	let tokenId: string | null = null;
-
 	it("should obtain token from exchange_url", async ({ expect }) => {
 		const resp = await SELF.fetch(
 			`https://preview.devprod.cloudflare.dev/exchange?exchange_url=${encodeURIComponent(
@@ -139,7 +143,7 @@ describe("Preview Worker", () => {
 		).toMatchInlineSnapshot(
 			'"token=00000000-0000-0000-0000-000000000000; Domain=random-data.preview.devprod.cloudflare.dev; HttpOnly; Secure; Partitioned; SameSite=None"'
 		);
-		tokenId = (resp.headers.get("set-cookie") ?? "")
+		const tokenId = (resp.headers.get("set-cookie") ?? "")
 			.split(";")[0]
 			.split("=")[1];
 		resp = await SELF.fetch(
@@ -152,9 +156,7 @@ describe("Preview Worker", () => {
 			}
 		);
 
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any -- ignoring this test type error for sake of turborepo PR
-		const json = (await resp.json()) as any;
-
+		const json = await resp.json();
 		expect(json).toMatchObject({
 			url: `${MOCK_REMOTE_URL}/`,
 			headers: expect.arrayContaining([["cf-workers-preview-token", token]]),
@@ -180,10 +182,22 @@ describe("Preview Worker", () => {
 		).toMatchInlineSnapshot(
 			'"token=00000000-0000-0000-0000-000000000000; Domain=random-data.preview.devprod.cloudflare.dev; HttpOnly; Secure; Partitioned; SameSite=None"'
 		);
-		tokenId = (resp.headers.get("set-cookie") ?? "")
-			.split(";")[0]
-			.split("=")[1];
 	});
+
+	async function getToken() {
+		const resp = await SELF.fetch(
+			`https://random-data.preview.devprod.cloudflare.dev/.update-preview-token?token=TEST_TOKEN&prewarm=${encodeURIComponent(
+				`${MOCK_REMOTE_URL}/prewarm`
+			)}&remote=${encodeURIComponent(
+				MOCK_REMOTE_URL
+			)}&suffix=${encodeURIComponent("/hello?world")}`,
+			{
+				method: "GET",
+				redirect: "manual",
+			}
+		);
+		return (resp.headers.get("set-cookie") ?? "").split(";")[0].split("=")[1];
+	}
 	it("should reject invalid prewarm url", async ({ expect }) => {
 		vi.spyOn(console, "error").mockImplementation(() => {});
 		const resp = await SELF.fetch(
@@ -210,6 +224,7 @@ describe("Preview Worker", () => {
 	});
 
 	it("should convert cookie to header", async ({ expect }) => {
+		const tokenId = await getToken();
 		const resp = await SELF.fetch(
 			`https://random-data.preview.devprod.cloudflare.dev`,
 			{
@@ -229,6 +244,7 @@ describe("Preview Worker", () => {
 		});
 	});
 	it("should not follow redirects", async ({ expect }) => {
+		const tokenId = await getToken();
 		const resp = await SELF.fetch(
 			`https://random-data.preview.devprod.cloudflare.dev/redirect`,
 			{
@@ -247,6 +263,7 @@ describe("Preview Worker", () => {
 		expect(await resp.text()).toMatchInlineSnapshot('""');
 	});
 	it("should return method", async ({ expect }) => {
+		const tokenId = await getToken();
 		const resp = await SELF.fetch(
 			`https://random-data.preview.devprod.cloudflare.dev/method`,
 			{
@@ -261,6 +278,7 @@ describe("Preview Worker", () => {
 		expect(await resp.text()).toMatchInlineSnapshot('"PUT"');
 	});
 	it("should return header", async ({ expect }) => {
+		const tokenId = await getToken();
 		const resp = await SELF.fetch(
 			`https://random-data.preview.devprod.cloudflare.dev/header`,
 			{
@@ -276,6 +294,7 @@ describe("Preview Worker", () => {
 		expect(await resp.text()).toMatchInlineSnapshot('"custom"');
 	});
 	it("should return status", async ({ expect }) => {
+		const tokenId = await getToken();
 		const resp = await SELF.fetch(
 			`https://random-data.preview.devprod.cloudflare.dev/status`,
 			{

packages/edge-preview-authenticated-proxy/vitest.config.mts

@@ -15,6 +15,7 @@ export default defineWorkersConfig({
 				},
 			},
 		},
+		retry: 2,
 	},
 	resolve: {
 		// promjs has broken package.json (main points to lib/index.js but files are at root)