Skip to content

Commit 135b74f

Browse files
committed
[test] Don't use request.allHeaders() in sync page.on() callbacks
This should avoid running into these issues: ``` request.allHeaders: Target page, context or browser has been closed ``` The sync `headers()` method is sufficient for these use cases: > Note that this method does not return security-related headers, > including cookie-related ones. You can use `request.allHeaders()` for > complete list of headers that include cookie information. Alternative for #86740.
1 parent 7cdb4d0 commit 135b74f

File tree

2 files changed

+10
-26
lines changed

2 files changed

+10
-26
lines changed

test/e2e/app-dir/app-basepath/index.test.ts

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,8 @@ describe('app dir - basepath', () => {
7575
let rscRequests = []
7676
const browser = await next.browser(path, {
7777
beforePageLoad(page) {
78-
page.on('request', async (request) => {
79-
let headers: { [key: string]: string }
80-
try {
81-
headers = await request.allHeaders()
82-
} catch (e) {
83-
if (
84-
e.message.includes(
85-
'Target page, context or browser has been closed'
86-
)
87-
) {
88-
// Ignore errors caused by closed browser during test teardown
89-
return
90-
}
91-
throw e
92-
}
93-
78+
page.on('request', (request) => {
79+
const headers = request.headers()
9480
if (
9581
headers['rsc'] === '1' &&
9682
// Prefetches also include `rsc`

test/e2e/switchable-runtime/index.test.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,10 @@ describe('Switchable runtime', () => {
107107
const browser = await webdriver(context.appPort, '/node', {
108108
beforePageLoad(page) {
109109
page.on('request', (request) => {
110-
return request.allHeaders().then((headers) => {
111-
if (headers['rsc'] === '1') {
112-
flightRequest = request.url()
113-
}
114-
})
110+
const headers = request.headers()
111+
if (headers['rsc'] === '1') {
112+
flightRequest = request.url()
113+
}
115114
})
116115
},
117116
})
@@ -639,11 +638,10 @@ describe('Switchable runtime', () => {
639638
const browser = await webdriver(context.appPort, '/node', {
640639
beforePageLoad(page) {
641640
page.on('request', (request) => {
642-
request.allHeaders().then((headers) => {
643-
if (headers['rsc'] === '1') {
644-
flightRequest = request.url()
645-
}
646-
})
641+
const headers = request.headers()
642+
if (headers['rsc'] === '1') {
643+
flightRequest = request.url()
644+
}
647645
})
648646
},
649647
})

0 commit comments

Comments
 (0)