Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore(bidi): wait for pages to close before returning from context.close() (#39588)

Holger Benl0a871c9db89c
diff --git a/packages/playwright-core/src/server/bidi/bidiBrowser.ts b/packages/playwright-core/src/server/bidi/bidiBrowser.ts
index 9a4ac5b7cb..f3444410bb 100644
--- a/packages/playwright-core/src/server/bidi/bidiBrowser.ts
+++ b/packages/playwright-core/src/server/bidi/bidiBrowser.ts
@@ -505,6 +505,7 @@ export class BidiBrowserContext extends BrowserContext {
await this._browser._browserSession.send('browser.removeUserContext', {
userContext: this._browserContextId
});
+ await Promise.all(this._bidiPages().map(bidiPage => bidiPage._page.closedPromise));
this._browser._contexts.delete(this._browserContextId);
}
diff --git a/packages/playwright-core/src/server/page.ts b/packages/playwright-core/src/server/page.ts
index 894f1a49dc..4ace511c0a 100644
--- a/packages/playwright-core/src/server/page.ts
+++ b/packages/playwright-core/src/server/page.ts
@@ -157,7 +157,7 @@ export class Page extends SdkObject<PageEventMap> {
static Events = PageEvent;
private _closedState: 'open' | 'closing' | 'closed' = 'open';
- private _closedPromise = new ManualPromise<void>();
+ readonly closedPromise = new ManualPromise<void>();
private _initialized: Page | Error | undefined;
private _initializedPromise = new ManualPromise<Page | Error>();
private _consoleMessages: ConsoleMessage[] = [];
@@ -284,7 +284,7 @@ export class Page extends SdkObject<PageEventMap> {
this._closedState = 'closed';
this.emit(Page.Events.Close);
this.browserContext.emit(BrowserContext.Events.PageClosed, this);
- this._closedPromise.resolve();
+ this.closedPromise.resolve();
this.instrumentation.onPageClose(this);
this.openScope.close(new TargetClosedError(this.closeReason()));
}
@@ -797,7 +797,7 @@ export class Page extends SdkObject<PageEventMap> {
await this.delegate.closePage(runBeforeUnload).catch(e => debugLogger.log('error', e));
}
if (!runBeforeUnload)
- await this._closedPromise;
+ await this.closedPromise;
}
isClosed(): boolean {
diff --git a/tests/bidi/expectations/moz-firefox-nightly-library.txt b/tests/bidi/expectations/moz-firefox-nightly-library.txt
index 9a83524456..2202fd34be 100644
--- a/tests/bidi/expectations/moz-firefox-nightly-library.txt
+++ b/tests/bidi/expectations/moz-firefox-nightly-library.txt
@@ -1,7 +1,6 @@
library/agent-perform.spec.ts › retrieve a secret [timeout]
library/browsercontext-add-cookies.spec.ts › should set cookies with SameSite attribute and no secure attribute [fail]
library/browsercontext-basic.spec.ts › fetch with keepalive should throw when offline [fail]
-library/browsercontext-basic.spec.ts › should close all belonging pages once closing context [fail]
library/browsercontext-basic.spec.ts › should disable javascript [fail]
library/browsercontext-basic.spec.ts › should emulate media in cross-process iframe [fail]
library/browsercontext-basic.spec.ts › should emulate media in popup [fail]
@@ -156,6 +155,7 @@ library/popup.spec.ts › should use viewport size from window features [timeout
library/role-utils.spec.ts › axe-core accessible-text [timeout]
library/role-utils.spec.ts › wpt accname #2 [timeout]
library/route-web-socket.spec.ts › should emit close upon frame detach [timeout]
+library/screencast.spec.ts › screencast.start emits screencastframe events [fail]
library/screenshot.spec.ts › page screenshot › should work with device scale factor and scale:css [fail]
library/screenshot.spec.ts › page screenshot › should work with device scale factor, clip and scale:css [fail]
library/selector-generator.spec.ts › selector generator › should work in dynamic iframes without navigation [fail]
diff --git a/tests/bidi/expectations/moz-firefox-nightly-page.txt b/tests/bidi/expectations/moz-firefox-nightly-page.txt
index aaec3f6391..07177c1dbf 100644
--- a/tests/bidi/expectations/moz-firefox-nightly-page.txt
+++ b/tests/bidi/expectations/moz-firefox-nightly-page.txt
@@ -107,6 +107,7 @@ page/page-history.spec.ts › goBack/goForward should work with bfcache-able pag
page/page-history.spec.ts › page.goBack should work for file urls [timeout]
page/page-history.spec.ts › regression test for issue 20791 [flaky]
page/page-keyboard.spec.ts › insertText should only emit input event [fail]
+page/page-keyboard.spec.ts › should press audio and media control keys [fail]
page/page-keyboard.spec.ts › should press Enter [fail]
page/page-keyboard.spec.ts › should send a character with insertText [fail]
page/page-mouse.spec.ts › should always round down [fail]