Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore(bidi): compute resourceType for requests (#37207)
Holger Benl8d5c176722a1
diff --git a/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts b/packages/playwright-core/src/server/bidi/bidiNetworkManager.tsindex ac418ff615..878a89ddd5 100644--- a/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts+++ b/packages/playwright-core/src/server/bidi/bidiNetworkManager.ts@@ -240,8 +240,8 @@ class BidiRequest {redirectedFrom._redirectedTo = this;// TODO: missing in the spec?const postDataBuffer = null;- this.request = new network.Request(frame._page.browserContext, frame, null, redirectedFrom ? redirectedFrom.request : null, payload.navigation ?? undefined,- payload.request.url, 'other', payload.request.method, postDataBuffer, fromBidiHeaders(payload.request.headers));+ this.request = new network.Request(frame._page.browserContext, frame, null, redirectedFrom ? redirectedFrom.request : null, payload.navigation ?? undefined, payload.request.url,+ resourceTypeFromBidi(payload.request.destination, payload.request.initiatorType, payload.initiator?.type), payload.request.method, postDataBuffer, fromBidiHeaders(payload.request.headers));// "raw" headers are the same as "provisional" headers in Bidi.this.request.setRawRequestHeaders(null);this.request._setBodySize(payload.request.bodySize || 0);@@ -358,3 +358,33 @@ function toBidiSameSite(sameSite?: 'Strict' | 'Lax' | 'None'): bidi.Network.Samereturn bidi.Network.SameSite.Lax;return bidi.Network.SameSite.None;}++function resourceTypeFromBidi(requestDestination: string, requestInitiatorType: string | null, eventInitiatorType: string | undefined): string {+ switch (requestDestination) {+ case 'audio': return 'media';+ case 'audioworklet': return 'script';+ case 'document': return 'document';+ case 'font': return 'font';+ case 'frame': return 'document';+ case 'iframe': return 'document';+ case 'image': return 'image';+ case 'object': return 'object';+ case 'paintworklet': return 'script';+ case 'script': return 'script';+ case 'serviceworker': return 'script';+ case 'sharedworker': return 'script';+ case 'style': return 'stylesheet';+ case 'track': return 'texttrack';+ case 'video': return 'media';+ case 'worker': return 'script';+ case '':+ switch (requestInitiatorType) {+ case 'fetch': return 'fetch';+ case 'font': return 'font';+ case 'xmlhttprequest': return 'xhr';+ case null: return eventInitiatorType === 'script' ? 'xhr' : 'document';+ default: return 'other';+ }+ default: return 'other';+ }+}diff --git a/tests/page/page-event-network.spec.ts b/tests/page/page-event-network.spec.tsindex e7004f576a..74f423a445 100644--- a/tests/page/page-event-network.spec.ts+++ b/tests/page/page-event-network.spec.ts@@ -54,7 +54,7 @@ it('Page.Events.RequestFailed @smoke', async ({ page, server, browserName, platfexpect(failedRequests[0].url()).toContain('one-style.css');expect(await failedRequests[0].response()).toBe(null);expect(failedRequests[0].resourceType()).toBe('stylesheet');- if (browserName === 'chromium') {+ if (browserName === 'chromium' || browserName === '_bidiChromium') {expect(failedRequests[0].failure().errorText).toBe('net::ERR_EMPTY_RESPONSE');} else if (browserName === 'webkit') {if (platform === 'linux')