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: disposable follow-up 2 (#39517)
Pavel Feldman3f001aba88a0
diff --git a/packages/playwright-core/src/client/disposable.ts b/packages/playwright-core/src/client/disposable.tsindex 1c6856834f..fc6b414d5a 100644--- a/packages/playwright-core/src/client/disposable.ts+++ b/packages/playwright-core/src/client/disposable.ts@@ -69,6 +69,8 @@ export class DisposableStub implements Disposable {}}-export function disposeAll(disposables: Disposable[]) {- return Promise.all(disposables.map(d => d.dispose()));+export async function disposeAll(disposables: Disposable[]) {+ const copy = [...disposables];+ disposables.length = 0;+ await Promise.all(copy.map(d => d.dispose()));}diff --git a/packages/playwright-core/src/mcp/browser/context.ts b/packages/playwright-core/src/mcp/browser/context.tsindex c439cc3a36..8a768c9a5d 100644--- a/packages/playwright-core/src/mcp/browser/context.ts+++ b/packages/playwright-core/src/mcp/browser/context.ts@@ -89,7 +89,7 @@ export class Context {}async dispose() {- disposeAll(this._disposables);+ await disposeAll(this._disposables);for (const tab of this._tabs)await tab.dispose();this._tabs.length = 0;diff --git a/packages/playwright-core/src/mcp/browser/tab.ts b/packages/playwright-core/src/mcp/browser/tab.tsindex 7e31209505..427e159d6c 100644--- a/packages/playwright-core/src/mcp/browser/tab.ts+++ b/packages/playwright-core/src/mcp/browser/tab.ts@@ -28,11 +28,13 @@ import { LogFile } from './logFile';import { ModalState } from './tools/tool';import { handleDialog } from './tools/dialogs';import { uploadFile } from './tools/files';-import type { Disposable } from '../../client/disposable';+import { disposeAll } from '../../client/disposable';+import type { Context } from './context';import type { Page } from '../../client/page';import type { Locator } from '../../client/locator';import type { FullConfig } from './config';+import type { Disposable } from '../../client/disposable';const TabEvents = {modalState: 'modalState'@@ -143,9 +145,7 @@ export class Tab extends EventEmitter<TabEventsInterface> {}async dispose() {- for (const disposable of this._disposables)- await disposable.dispose();- this._disposables = [];+ await disposeAll(this._disposables);this._consoleLog.stop();}diff --git a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.tsindex 511b529e87..bbc9bd2146 100644--- a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts@@ -37,6 +37,7 @@ import { Recorder } from '../recorder';import { RecorderApp } from '../recorder/recorderApp';import { ElementHandleDispatcher } from './elementHandlerDispatcher';import { JSHandleDispatcher } from './jsHandleDispatcher';+import { disposeAll } from '../disposable';import type { ConsoleMessage } from '../console';import type { Dialog } from '../dialog';@@ -433,9 +434,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channelthis._context.dialogManager.removeDialogHandler(this._dialogHandler);this._interceptionUrlMatchers = [];this._context.removeRequestInterceptor(this._requestInterceptor).catch(() => {});- for (const disposable of this._disposables)- disposable.dispose().catch(() => {});- this._disposables = [];+ disposeAll(this._disposables).catch(() => {});if (this._routeWebSocketInitScript)WebSocketRouteDispatcher.uninstall(this.connection, this._context, this._routeWebSocketInitScript).catch(() => {});this._routeWebSocketInitScript = undefined;diff --git a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts b/packages/playwright-core/src/server/dispatchers/pageDispatcher.tsindex df6fb0e754..1db5d3b645 100644--- a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts+++ b/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts@@ -31,6 +31,7 @@ import { SdkObject } from '../instrumentation';import { deserializeURLMatch, urlMatches } from '../../utils/isomorphic/urlMatch';import { PageAgentDispatcher } from './pageAgentDispatcher';import { Recorder } from '../recorder';+import { disposeAll } from '../disposable';import type { Artifact } from '../artifact';import type { BrowserContext } from '../browserContext';@@ -425,9 +426,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows// Cleanup properly and leave the page in a good state. Other clients may still connect and use it.this._interceptionUrlMatchers = [];this._page.removeRequestInterceptor(this._requestInterceptor).catch(() => {});- for (const disposable of this._disposables)- disposable.dispose().catch(() => {});- this._disposables = [];+ disposeAll(this._disposables).catch(() => {});if (this._routeWebSocketInitScript)WebSocketRouteDispatcher.uninstall(this.connection, this._page, this._routeWebSocketInitScript).catch(() => {});this._routeWebSocketInitScript = undefined;diff --git a/packages/playwright-core/src/server/disposable.ts b/packages/playwright-core/src/server/disposable.tsindex dd3a04e36a..de64b8527f 100644--- a/packages/playwright-core/src/server/disposable.ts+++ b/packages/playwright-core/src/server/disposable.ts@@ -33,3 +33,9 @@ export abstract class DisposableObject extends SdkObject implements Disposable {abstract dispose(): Promise<void>;}++export async function disposeAll(disposables: Disposable[]) {+ const copy = [...disposables];+ disposables.length = 0;+ await Promise.all(copy.map(d => d.dispose()));+}