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): fix finding the opener for popups (#38199)
Holger Benlfef825179f4e
diff --git a/packages/playwright-core/src/server/bidi/bidiBrowser.ts b/packages/playwright-core/src/server/bidi/bidiBrowser.tsindex d9cdc83e0e..7ac5e105a7 100644--- a/packages/playwright-core/src/server/bidi/bidiBrowser.ts+++ b/packages/playwright-core/src/server/bidi/bidiBrowser.ts@@ -134,16 +134,13 @@ export class BidiBrowser extends Browser {private _onBrowsingContextCreated(event: bidi.BrowsingContext.Info) {if (event.parent) {const parentFrameId = event.parent;- for (const page of this._bidiPages.values()) {- const parentFrame = page._page.frameManager.frame(parentFrameId);- if (!parentFrame)- continue;+ const page = this._findPageForFrame(parentFrameId);+ if (page) {page._session.addFrameBrowsingContext(event.context);page._page.frameManager.frameAttached(event.context, parentFrameId);const frame = page._page.frameManager.frame(event.context);if (frame)frame._url = event.url;- return;}return;}@@ -153,7 +150,7 @@ export class BidiBrowser extends Browser {if (!context)return;const session = this._connection.createMainFrameBrowsingContextSession(event.context);- const opener = event.originalOpener && this._bidiPages.get(event.originalOpener);+ const opener = event.originalOpener && this._findPageForFrame(event.originalOpener);const page = new BidiPage(context, session, opener || null);page._page.mainFrame()._url = event.url;this._bidiPages.set(event.context, page);@@ -185,6 +182,13 @@ export class BidiBrowser extends Browser {return;}}++ private _findPageForFrame(frameId: string) {+ for (const page of this._bidiPages.values()) {+ if (page._page.frameManager.frame(frameId))+ return page;+ }+ }}export class BidiBrowserContext extends BrowserContext {diff --git a/tests/page/page-event-popup.spec.ts b/tests/page/page-event-popup.spec.tsindex 152136acde..9c9ba51ac9 100644--- a/tests/page/page-event-popup.spec.ts+++ b/tests/page/page-event-popup.spec.ts@@ -148,7 +148,7 @@ it('should work with clicking target=_blank and rel=noopener', async ({ page, seit('should report popup opened from iframes', async ({ page, server, browserName }) => {await page.goto(server.PREFIX + '/frames/two-frames.html');- const frame = page.frame('uno');+ const frame = page.frames()[1];expect(frame).toBeTruthy();const [popup] = await Promise.all([page.waitForEvent('popup'),