Unverified Commit 3352f9ee authored by Hendrik Liebau's avatar Hendrik Liebau Committed by GitHub

[test] Don't use `request.allHeaders()` in sync `page.on()` callbacks (#86751)

parent d36c03ed
...@@ -75,22 +75,8 @@ describe('app dir - basepath', () => { ...@@ -75,22 +75,8 @@ describe('app dir - basepath', () => {
let rscRequests = [] let rscRequests = []
const browser = await next.browser(path, { const browser = await next.browser(path, {
beforePageLoad(page) { beforePageLoad(page) {
page.on('request', async (request) => { page.on('request', (request) => {
let headers: { [key: string]: string } const headers = request.headers()
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
}
if ( if (
headers['rsc'] === '1' && headers['rsc'] === '1' &&
// Prefetches also include `rsc` // Prefetches also include `rsc`
...@@ -103,6 +89,7 @@ describe('app dir - basepath', () => { ...@@ -103,6 +89,7 @@ describe('app dir - basepath', () => {
}) })
await browser.elementByCss('button').click() await browser.elementByCss('button').click()
await browser.waitForIdleNetwork()
await retry(async () => { await retry(async () => {
expect(rscRequests).toEqual([ expect(rscRequests).toEqual([
expect.stringContaining(`${next.url}${path}`), expect.stringContaining(`${next.url}${path}`),
......
...@@ -107,12 +107,11 @@ describe('Switchable runtime', () => { ...@@ -107,12 +107,11 @@ describe('Switchable runtime', () => {
const browser = await webdriver(context.appPort, '/node', { const browser = await webdriver(context.appPort, '/node', {
beforePageLoad(page) { beforePageLoad(page) {
page.on('request', (request) => { page.on('request', (request) => {
return request.allHeaders().then((headers) => { const headers = request.headers()
if (headers['rsc'] === '1') { if (headers['rsc'] === '1') {
flightRequest = request.url() flightRequest = request.url()
} }
}) })
})
}, },
}) })
...@@ -639,12 +638,11 @@ describe('Switchable runtime', () => { ...@@ -639,12 +638,11 @@ describe('Switchable runtime', () => {
const browser = await webdriver(context.appPort, '/node', { const browser = await webdriver(context.appPort, '/node', {
beforePageLoad(page) { beforePageLoad(page) {
page.on('request', (request) => { page.on('request', (request) => {
request.allHeaders().then((headers) => { const headers = request.headers()
if (headers['rsc'] === '1') { if (headers['rsc'] === '1') {
flightRequest = request.url() flightRequest = request.url()
} }
}) })
})
}, },
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment