diff --git a/packages/tests-e2e/tests/appRouter/isr.test.ts b/packages/tests-e2e/tests/appRouter/isr.test.ts index 79c68102c..3a9eabda9 100644 --- a/packages/tests-e2e/tests/appRouter/isr.test.ts +++ b/packages/tests-e2e/tests/appRouter/isr.test.ts @@ -98,7 +98,9 @@ test.describe("dynamicParams set to true", () => { test("should be HIT on a path that was prebuilt", async ({ page }) => { const res = await page.goto("/isr/dynamic-params-true/1"); expect(res?.status()).toEqual(200); - expect(res?.headers()["x-nextjs-cache"]).toEqual("HIT"); + const cacheHeader = + res?.headers()["x-nextjs-cache"] ?? res?.headers()["x-opennext-cache"]; + expect(cacheHeader).toEqual("HIT"); const title = await page.getByTestId("title").textContent(); const content = await page.getByTestId("content").textContent(); expect(title).toEqual("Post 1"); @@ -110,7 +112,9 @@ test.describe("dynamicParams set to true", () => { // We are gonna skip this one for now, turborepo caching can cause this page to be STALE once deployed test.skip("should SSR on a path that was not prebuilt", async ({ page }) => { const res = await page.goto("/isr/dynamic-params-true/11"); - expect(res?.headers()["x-nextjs-cache"]).toEqual("MISS"); + const cacheHeader = + res?.headers()["x-nextjs-cache"] ?? res?.headers()["x-opennext-cache"]; + expect(cacheHeader).toEqual("MISS"); const title = await page.getByTestId("title").textContent(); const content = await page.getByTestId("content").textContent(); expect(title).toEqual("Post 11"); @@ -139,7 +143,9 @@ test.describe("dynamicParams set to false", () => { test("should be HIT on a path that was prebuilt", async ({ page }) => { const res = await page.goto("/isr/dynamic-params-false/1"); expect(res?.status()).toEqual(200); - expect(res?.headers()["x-nextjs-cache"]).toEqual("HIT"); + const cacheHeader = + res?.headers()["x-nextjs-cache"] ?? res?.headers()["x-opennext-cache"]; + expect(cacheHeader).toEqual("HIT"); const title = await page.getByTestId("title").textContent(); const content = await page.getByTestId("content").textContent(); expect(title).toEqual("Post 1"); diff --git a/packages/tests-e2e/tests/appRouter/middleware.rewrite.test.ts b/packages/tests-e2e/tests/appRouter/middleware.rewrite.test.ts index afd3f7c5f..cd2d1e65d 100644 --- a/packages/tests-e2e/tests/appRouter/middleware.rewrite.test.ts +++ b/packages/tests-e2e/tests/appRouter/middleware.rewrite.test.ts @@ -1,4 +1,4 @@ -import { expect, test } from "@playwright/test"; +import { type Response as PwResponse, expect, test } from "@playwright/test"; import { validateMd5 } from "../utils"; /* @@ -23,14 +23,21 @@ test("Middleware Rewrite", async ({ page }) => { }); test("Middleware Rewrite External Image", async ({ page }) => { - page.on("response", async (response) => { - expect(response.status()).toBe(200); - expect(response.headers()["content-type"]).toBe("image/png"); - expect(response.headers()["cache-control"]).toBe("max-age=600"); - const bodyBuffer = await response.body(); - expect(validateMd5(bodyBuffer, OPENNEXT_PNG_MD5)).toBe(true); + const responsePromise = new Promise((resolve) => { + page.on("response", async (resp) => { + resolve(resp); + }); }); + await page.goto("/rewrite-external"); + + const response = await responsePromise; + + expect(response.status()).toBe(200); + expect(response.headers()["content-type"]).toBe("image/png"); + expect(response.headers()["cache-control"]).toBe("max-age=600"); + const bodyBuffer = await response.body(); + expect(validateMd5(bodyBuffer, OPENNEXT_PNG_MD5)).toBe(true); }); test("Middleware Rewrite Status Code", async ({ page }) => {