Skip to content

Commit 204e0f7

Browse files
authored
Merge branch 'main' into feat-server-function-inspector
2 parents 64a64c4 + 38faf5d commit 204e0f7

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

‎apps/tests/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"e2e": "playwright test",
1313
"e2e:bundled-dev": "playwright test --config playwright.bundled-dev.config.ts",
1414
"e2e:ui": "playwright test --ui",
15-
"test:all": "npm run unit:ci && npm run e2e && npm run e2e:bundled-dev"
15+
"test:all": "pnpm run unit:ci && pnpm run e2e && pnpm run e2e:bundled-dev"
1616
},
1717
"dependencies": {
1818
"@solidjs/meta": "^0.29.4",

‎apps/tests/src/e2e/hydration.test.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ test.describe("SSR Hydration", () => {
1919

2020
await expect(output).toHaveText("0");
2121

22-
await button.click();
23-
24-
await expect(output).toHaveText("1");
22+
// Retry until a click is handled post-hydration. Pre-hydration clicks are synchronous no-ops.
23+
await expect(async () => {
24+
await button.click();
25+
await expect(output).toHaveText("1", { timeout: 1000 });
26+
}).toPass({ timeout: 15000 });
2527

2628
expect(consoleErrors, "Expected no hydration mismatch errors in console").toEqual([]);
2729
});

‎apps/tests/vitest.config.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ export default defineConfig({
1010
},
1111
},
1212
plugins: [solid()],
13+
optimizeDeps: {
14+
include: ["@solidjs/testing-library"],
15+
},
1316
test: {
1417
mockReset: true,
1518
globals: true,

0 commit comments

Comments
 (0)