Skip to content

test(rsc): fix e2e flakes in use-cache-persistent and isolated fixture setup #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hi-ogawa merged 4 commits into from
Oct 5, 2026
Merged

test(rsc): fix e2e flakes in use-cache-persistent and isolated fixture setup #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a0b609
test(rsc): fix HMR edit races in e2e
james-elicx Oct 2, 2026
f74bb8e
test(rsc): allow 60s for isolated fixture installs
james-elicx Oct 2, 2026
f9d69d4
test(rsc): lead e2e deflake comments with what they do
hi-ogawa Oct 5, 2026
17be196
test(rsc): move e2e write spacing to #1489
hi-ogawa Oct 5, 2026
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
4 changes: 4 additions & 0 deletions packages/plugin-rsc/e2e/fixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,10 @@ export async function setupIsolatedFixture(options: {
dest: string
overrides?: Record<string, string>
}) {
// Allow 60s for the calling `beforeAll` hook, because `pnpm i` hits the
// network and can exceed the default 30s on macOS runners.
test.setTimeout(60_000)

// copy fixture
fs.rmSync(options.dest, { recursive: true, force: true })
fs.cpSync(options.src, options.dest, {
Expand Down
25 changes: 22 additions & 3 deletions packages/plugin-rsc/e2e/use-cache-persistent.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ function defineDevTests(f: Fixture) {
await expect(executionCount).toHaveText('1')

// Editing the cached function advances its module generation.
action.edit((code) => code.replace('body-v1', 'body-v2'))
await editServerModule(page, () =>
action.edit((code) => code.replace('body-v1', 'body-v2')),
)
await page.reload()
await waitForHydration(page)
await expectResultAfterUpdate(
Expand All @@ -123,7 +125,9 @@ function defineDevTests(f: Fixture) {
)

// Editing a direct dependency invalidates the importing cache module.
direct.edit((code) => code.replace('direct-v1', 'direct-v2'))
await editServerModule(page, () =>
direct.edit((code) => code.replace('direct-v1', 'direct-v2')),
)
await page.reload()
await waitForHydration(page)
await expectResultAfterUpdate(
Expand All @@ -134,7 +138,9 @@ function defineDevTests(f: Fixture) {
)

// Reverse-importer traversal also reaches transitive dependencies.
transitive.edit((code) => code.replace('transitive-v1', 'transitive-v2'))
await editServerModule(page, () =>
transitive.edit((code) => code.replace('transitive-v1', 'transitive-v2')),
)
await page.reload()
await waitForHydration(page)
await expectResultAfterUpdate(
Expand All @@ -159,6 +165,19 @@ function defineDevTests(f: Fixture) {
})
}

// Edit a server module and wait for the `rsc:update` refetch it triggers.
// Reloading before that finishes can abort the refetch (an unhandled
// `TypeError: Load failed` in WebKit), or let the late update reach the
// reloaded page before it has hydrated.
async function editServerModule(page: Page, edit: () => void) {
const refetch = page.waitForResponse(
(response) =>
response.request().method() === 'GET' && response.url().includes('_.rsc'),
)
edit()
await (await refetch).finished()
}

async function expectResultAfterUpdate(
page: Page,
form: Locator,
Expand Down
Loading