Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/integration-full.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: Branch

# The main branch gets the full run across
# The main and v7 branches get the full run across
# all OS/browsers for multiple node versions

on:
push:
branches:
- main
- v7
paths-ignore:
- "packages/*/.changes/**"
- "decisions/**"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
- v7
tags-ignore:
- v*
paths-ignore:
Expand Down
7 changes: 6 additions & 1 deletion integration/error-sanitization-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,12 @@ test.describe("Error Sanitization", () => {
process.env.NODE_ENV = "development";
});
test.afterEach(() => {
process.env.NODE_ENV = ogEnv;
if (ogEnv === undefined) {
// Assigning undefined would leak the string "undefined" to later builds.
delete process.env.NODE_ENV;
} else {
process.env.NODE_ENV = ogEnv;
}
});

test("renders document without errors", async () => {
Expand Down
20 changes: 10 additions & 10 deletions integration/middleware-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1898,28 +1898,28 @@ test.describe("Middleware", () => {
let app = new PlaywrightFixture(appFixture, page);

await app.goto("/revalidate/parent/1");
expect(await page.locator("#parent-loader-data").textContent()).toBe(
await expect(page.locator("#parent-loader-data")).toHaveText(
"parent middleware 1,child middleware 1,parent loader 1,child loader 1",
);
expect(await page.locator("#child-loader-data").textContent()).toBe(
await expect(page.locator("#child-loader-data")).toHaveText(
"parent middleware 1,child middleware 1,parent loader 1,child loader 1",
);

await app.clickLink("/revalidate/parent/2");
expect(await page.locator("#parent-loader-data").textContent()).toBe(
"parent middleware 1,child middleware 1,parent loader 1,child loader 1",
);
expect(await page.locator("#child-loader-data").textContent()).toBe(
await expect(page.locator("#child-loader-data")).toHaveText(
"parent middleware 2,child middleware 2,child loader 2",
);

await app.clickLink("/revalidate/parent/3");
expect(await page.locator("#parent-loader-data").textContent()).toBe(
await expect(page.locator("#parent-loader-data")).toHaveText(
"parent middleware 1,child middleware 1,parent loader 1,child loader 1",
);
expect(await page.locator("#child-loader-data").textContent()).toBe(

await app.clickLink("/revalidate/parent/3");
await expect(page.locator("#child-loader-data")).toHaveText(
"parent middleware 3,child middleware 3,child loader 3",
);
await expect(page.locator("#parent-loader-data")).toHaveText(
"parent middleware 1,child middleware 1,parent loader 1,child loader 1",
);
});

test("calls middleware for routes even without a loader (document)", async ({
Expand Down
28 changes: 10 additions & 18 deletions integration/passthrough-requests-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -185,45 +185,37 @@ test.describe("pass through requests", () => {

// Document load
await app.goto("/");
expect(await page.locator("[data-loader-url]").textContent()).toBe("/");
expect(await page.locator("[data-loader-path]").textContent()).toBe("/");
await expect(page.locator("[data-loader-url]")).toHaveText("/");
await expect(page.locator("[data-loader-path]")).toHaveText("/");

// Client-side navigation with query params
await app.clickLink("/?a=1");
expect(await page.locator("[data-loader-url]").textContent()).toBe(
await expect(page.locator("[data-loader-url]")).toHaveText(
"/_root.data?a=1",
);
expect(await page.locator("[data-loader-path]").textContent()).toBe(
"/?a=1",
);
await expect(page.locator("[data-loader-path]")).toHaveText("/?a=1");
expect(requests).toEqual(["/_root.data?a=1"]);
requests = [];

// Client-side form submission with query params
await app.clickElement('button[type="submit"]');
expect(await page.locator("[data-action-url]").textContent()).toBe(
await expect(page.locator("[data-action-url]")).toHaveText(
"/_root.data?index&a=1",
);
expect(await page.locator("[data-action-path]").textContent()).toBe(
"/?a=1",
);
expect(await page.locator("[data-loader-url]").textContent()).toBe(
await expect(page.locator("[data-action-path]")).toHaveText("/?a=1");
await expect(page.locator("[data-loader-url]")).toHaveText(
"/_root.data?a=1",
);
expect(await page.locator("[data-loader-path]").textContent()).toBe(
"/?a=1",
);
await expect(page.locator("[data-loader-path]")).toHaveText("/?a=1");
expect(requests).toEqual(["/_root.data?index&a=1", "/_root.data?a=1"]);
requests = [];

// Navigate to new page
await app.clickLink("/page?b=2");
expect(await page.locator("[data-loader-url]").textContent()).toBe(
await expect(page.locator("[data-loader-url]")).toHaveText(
"/page.data?b=2&_routes=routes%2Fpage",
);
expect(await page.locator("[data-loader-path]").textContent()).toBe(
"/page?b=2",
);
await expect(page.locator("[data-loader-path]")).toHaveText("/page?b=2");
expect(requests).toEqual(["/page.data?b=2&_routes=routes%2Fpage"]);
requests = [];
});
Expand Down
1 change: 1 addition & 0 deletions integration/request-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ test("loader request on CSR GET requests", async ({ page }) => {
expect(loaderData.body).toEqual(null);

await app.clickElement("#submit-get-csr");
await expect(page.locator("#loader-data")).toContainText("?type=csr");

loaderData = JSON.parse(await page.locator("#loader-data").innerHTML());
expect(loaderData.method).toEqual("GET");
Expand Down
12 changes: 6 additions & 6 deletions integration/scroll-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@ function runTests() {
let scroll = await page.evaluate(() => window.scrollY);
expect(scroll).toBe(0);
await app.clickLink("/hash#hello-world");
await new Promise((r) => setTimeout(r, 0));
scroll = await page.evaluate(() => window.scrollY);
expect(scroll).toBeGreaterThan(0);
await expect
.poll(() => page.evaluate(() => window.scrollY))
.toBeGreaterThan(0);
});

test("should scroll to hash locations with URL encoded characters", async ({
Expand All @@ -117,8 +117,8 @@ function runTests() {
let scroll = await page.evaluate(() => window.scrollY);
expect(scroll).toBe(0);
await app.clickLink("/hash#hello 🌎");
await new Promise((r) => setTimeout(r, 0));
scroll = await page.evaluate(() => window.scrollY);
expect(scroll).toBeGreaterThan(0);
await expect
.poll(() => page.evaluate(() => window.scrollY))
.toBeGreaterThan(0);
});
}
3 changes: 2 additions & 1 deletion integration/vite-plugin-cloudflare-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ function defineFiles({
export default defineConfig({
${await viteConfig.server({ port })}
plugins: [
cloudflare({ viteEnvironment: { name: "ssr" } }),
// Parallel fixtures don't need the Workers debugger or its shared port.
cloudflare({ viteEnvironment: { name: "ssr" }, inspectorPort: false }),
reactRouter(),
]${reversePlugins ? ".reverse()" : ""},
});
Expand Down
Loading