Skip to content
Draft
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
19 changes: 3 additions & 16 deletions test/e2e/app-dir/app-basepath/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,8 @@ describe('app dir - basepath', () => {
let rscRequests = []
const browser = await next.browser(path, {
beforePageLoad(page) {
page.on('request', async (request) => {
let headers: { [key: string]: string }
try {
headers = await request.allHeaders()
} catch (e) {
if (
e.message.includes(
'Target page, context or browser has been closed'
)
) {
// Ignore errors caused by closed browser during test teardown
return
}
throw e
}

page.on('request', (request) => {
const headers = request.headers()
if (
headers['rsc'] === '1' &&
// Prefetches also include `rsc`
Expand All @@ -103,6 +89,7 @@ describe('app dir - basepath', () => {
})

await browser.elementByCss('button').click()
await browser.waitForIdleNetwork()
await retry(async () => {
expect(rscRequests).toEqual([
expect.stringContaining(`${next.url}${path}`),
Expand Down
18 changes: 8 additions & 10 deletions test/e2e/switchable-runtime/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,10 @@ describe('Switchable runtime', () => {
const browser = await webdriver(context.appPort, '/node', {
beforePageLoad(page) {
page.on('request', (request) => {
return request.allHeaders().then((headers) => {
if (headers['rsc'] === '1') {
flightRequest = request.url()
}
})
const headers = request.headers()
if (headers['rsc'] === '1') {
flightRequest = request.url()
}
})
},
})
Expand Down Expand Up @@ -639,11 +638,10 @@ describe('Switchable runtime', () => {
const browser = await webdriver(context.appPort, '/node', {
beforePageLoad(page) {
page.on('request', (request) => {
request.allHeaders().then((headers) => {
if (headers['rsc'] === '1') {
flightRequest = request.url()
}
})
const headers = request.headers()
if (headers['rsc'] === '1') {
flightRequest = request.url()
}
})
},
})
Expand Down
Loading