yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(chromium): close background pages on close (#6608)

Browse Source
This commit is contained in:
Max Schmitt 2021-05-18 18:07:45 +02:00 committed by GitHub
parent d2938d0a30
commit b52cbfdb16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/browserContext.ts
View File

@ -151,6 +151,7 @@ export abstract class BrowserContext extends SdkObject {
abstract _doExposeBinding(binding: PageBinding): Promise<void>;
abstract _doUpdateRequestInterception(): Promise<void>;
abstract _doClose(): Promise<void>;
abstract _onClosePersistent(): Promise<void>;
async cookies(urls: string | string[] | undefined = []): Promise<types.NetworkCookie[]> {
if (urls && !Array.isArray(urls))
@ -283,6 +284,7 @@ export abstract class BrowserContext extends SdkObject {
// Close all the pages instead of the context,
// because we cannot close the default context.
await Promise.all(this.pages().map(page => page.close(metadata)));
await this._onClosePersistent();
} else {
// Close the context.
await this._doClose();

9
src/server/chromium/crBrowser.ts
View File

@ -437,6 +437,15 @@ export class CRBrowserContext extends BrowserContext {
}
}
async _onClosePersistent() {
for (const [targetId, backgroundPage] of this._browser._backgroundPages.entries()) {
if (backgroundPage._browserContext === this && backgroundPage._initializedPage) {
backgroundPage.didClose();
this._browser._backgroundPages.delete(targetId);
}
}
}
backgroundPages(): Page[] {
const result: Page[] = [];
for (const backgroundPage of this._browser._backgroundPages.values()) {

2
src/server/firefox/ffBrowser.ts
View File

@ -311,6 +311,8 @@ export class FFBrowserContext extends BrowserContext {
await this._browser._connection.send('Browser.setRequestInterception', { browserContextId: this._browserContextId, enabled: !!this._requestInterceptor });
}
async _onClosePersistent() {}
async _doClose() {
assert(this._browserContextId);
await this._browser._connection.send('Browser.removeBrowserContext', { browserContextId: this._browserContextId });

2
src/server/webkit/wkBrowser.ts
View File

@ -317,6 +317,8 @@ export class WKBrowserContext extends BrowserContext {
await (page._delegate as WKPage).updateRequestInterception();
}
async _onClosePersistent() {}
async _doClose() {
assert(this._browserContextId);
await this._browser._browserSession.send('Playwright.deleteContext', { browserContextId: this._browserContextId });

3
tests/chromium/launcher.spec.ts
View File

@ -72,8 +72,7 @@ it('should return background pages', async ({browserType, browserOptions, create
expect(context.pages()).not.toContain(backgroundPage);
await context.close();
expect(context.pages().length).toBe(0);
// TODO: the following line is flaky, uncomment once fixed.
// expect(context.backgroundPages().length).toBe(0);
expect(context.backgroundPages().length).toBe(0);
});
it('should return background pages when recording video', async ({browserType, browserOptions, createUserDataDir, asset}, testInfo) => {