Skip to content

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

chore: follow up to disposables (#39510)

Pavel Feldmanb87fa03fc601
diff --git a/docs/src/api/class-browsercontext.md b/docs/src/api/class-browsercontext.md
index 2f345a46e5..24f07b5a67 100644
--- a/docs/src/api/class-browsercontext.md
+++ b/docs/src/api/class-browsercontext.md
@@ -1021,6 +1021,7 @@ API testing helper associated with this context. Requests made with this API wil
## async method: BrowserContext.route
* since: v1.8
+- returns: <[Disposable]>
Routing provides the capability to modify network requests that are made by any page in the browser context. Once route
is enabled, every request matching the url pattern will stall unless it's continued, fulfilled or aborted.
diff --git a/docs/src/api/class-page.md b/docs/src/api/class-page.md
index 5150aaa51e..1b3093a52e 100644
--- a/docs/src/api/class-page.md
+++ b/docs/src/api/class-page.md
@@ -3566,6 +3566,7 @@ API testing helper associated with this page. This method returns the same insta
## async method: Page.route
* since: v1.8
+- returns: <[Disposable]>
Routing provides the capability to modify network requests that are made by a page.
diff --git a/packages/playwright-client/types/types.d.ts b/packages/playwright-client/types/types.d.ts
index 1dc4b7db36..9227156952 100644
--- a/packages/playwright-client/types/types.d.ts
+++ b/packages/playwright-client/types/types.d.ts
@@ -4147,7 +4147,7 @@ export interface Page {
* How often a route should be used. By default it will be used every time.
*/
times?: number;
- }): Promise<void>;
+ }): Promise<Disposable>;
/**
* If specified the network requests that are made in the page will be served from the HAR file. Read more about
@@ -9469,7 +9469,7 @@ export interface BrowserContext {
* How often a route should be used. By default it will be used every time.
*/
times?: number;
- }): Promise<void>;
+ }): Promise<Disposable>;
/**
* If specified the network requests that are made in the context will be served from the HAR file. Read more about
diff --git a/packages/playwright-core/src/client/api.ts b/packages/playwright-core/src/client/api.ts
index d84904d0d1..86b4eb2be3 100644
--- a/packages/playwright-core/src/client/api.ts
+++ b/packages/playwright-core/src/client/api.ts
@@ -23,7 +23,7 @@ export { Clock } from './clock';
export { ConsoleMessage } from './consoleMessage';
export { Coverage } from './coverage';
export { Dialog } from './dialog';
-export { Disposable } from './disposable';
+export type { Disposable } from './disposable';
export { Download } from './download';
export { Electron, ElectronApplication } from './electron';
export { FrameLocator, Locator } from './locator';
diff --git a/packages/playwright-core/src/client/browserContext.ts b/packages/playwright-core/src/client/browserContext.ts
index 2dab10473a..45d137c9c9 100644
--- a/packages/playwright-core/src/client/browserContext.ts
+++ b/packages/playwright-core/src/client/browserContext.ts
@@ -23,7 +23,7 @@ import { evaluationScript } from './clientHelper';
import { Clock } from './clock';
import { ConsoleMessage } from './consoleMessage';
import { Dialog } from './dialog';
-import { Disposable } from './disposable';
+import { DisposableObject, DisposableStub } from './disposable';
import { TargetClosedError, parseError } from './errors';
import { Events } from './events';
import { APIRequestContext } from './fetch';
@@ -352,25 +352,26 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
async addInitScript(script: Function | string | { path?: string, content?: string }, arg?: any) {
const source = await evaluationScript(this._platform, script, arg);
- return Disposable.from((await this._channel.addInitScript({ source })).disposable);
+ return DisposableObject.from((await this._channel.addInitScript({ source })).disposable);
}
- async exposeBinding(name: string, callback: (source: structs.BindingSource, ...args: any[]) => any, options: { handle?: boolean } = {}): Promise<Disposable> {
+ async exposeBinding(name: string, callback: (source: structs.BindingSource, ...args: any[]) => any, options: { handle?: boolean } = {}): Promise<DisposableObject> {
const result = await this._channel.exposeBinding({ name, needsHandle: options.handle });
this._bindings.set(name, callback);
- return Disposable.from(result.disposable);
+ return DisposableObject.from(result.disposable);
}
- async exposeFunction(name: string, callback: Function): Promise<Disposable> {
+ async exposeFunction(name: string, callback: Function): Promise<DisposableObject> {
const result = await this._channel.exposeBinding({ name });
const binding = (source: structs.BindingSource, ...args: any[]) => callback(...args);
this._bindings.set(name, binding);
- return Disposable.from(result.disposable);
+ return DisposableObject.from(result.disposable);
}
- async route(url: URLMatch, handler: network.RouteHandlerCallback, options: { times?: number } = {}): Promise<void> {
+ async route(url: URLMatch, handler: network.RouteHandlerCallback, options: { times?: number } = {}): Promise<DisposableStub> {
this._routes.unshift(new network.RouteHandler(this._platform, this._options.baseURL, url, handler, options.times));
await this._updateInterceptionPatterns({ title: 'Route requests' });
+ return new DisposableStub(() => this.unroute(url, handler));
}
async routeWebSocket(url: URLMatch, handler: network.WebSocketRouteHandlerCallback): Promise<void> {
diff --git a/packages/playwright-core/src/client/connection.ts b/packages/playwright-core/src/client/connection.ts
index 6b794e68a7..bc48d78159 100644
--- a/packages/playwright-core/src/client/connection.ts
+++ b/packages/playwright-core/src/client/connection.ts
@@ -24,7 +24,7 @@ import { CDPSession } from './cdpSession';
import { ChannelOwner } from './channelOwner';
import { createInstrumentation } from './clientInstrumentation';
import { Dialog } from './dialog';
-import { Disposable } from './disposable';
+import { DisposableObject } from './disposable';
import { Electron, ElectronApplication } from './electron';
import { ElementHandle } from './elementHandle';
import { TargetClosedError, parseError } from './errors';
@@ -272,7 +272,7 @@ export class Connection extends EventEmitter {
result = new Dialog(parent, type, guid, initializer);
break;
case 'Disposable':
- result = new Disposable(parent, type, guid, initializer);
+ result = new DisposableObject(parent, type, guid, initializer);
break;
case 'Electron':
result = new Electron(parent, type, guid, initializer);
diff --git a/packages/playwright-core/src/client/disposable.ts b/packages/playwright-core/src/client/disposable.ts
index fe32640e16..1c6856834f 100644
--- a/packages/playwright-core/src/client/disposable.ts
+++ b/packages/playwright-core/src/client/disposable.ts
@@ -19,8 +19,12 @@ import { isTargetClosedError } from './errors';
import type * as channels from '@protocol/channels';
-export class Disposable<T extends channels.DisposableChannel = channels.DisposableChannel> extends ChannelOwner<T> {
- static from(channel: channels.DisposableChannel): Disposable {
+export interface Disposable {
+ dispose: () => Promise<void>;
+}
+
+export class DisposableObject<T extends channels.DisposableChannel = channels.DisposableChannel> extends ChannelOwner<T> implements Disposable {
+ static from(channel: channels.DisposableChannel): DisposableObject {
return (channel as any)._object;
}
@@ -38,3 +42,33 @@ export class Disposable<T extends channels.DisposableChannel = channels.Disposab
}
}
}
+
+export class DisposableStub implements Disposable {
+ private _dispose: (() => Promise<void>) | undefined;
+
+ constructor(dispose: () => Promise<void>) {
+ this._dispose = dispose;
+ }
+
+ async [Symbol.asyncDispose]() {
+ await this.dispose();
+ }
+
+ async dispose() {
+ if (!this._dispose)
+ return;
+ try {
+ const dispose = this._dispose;
+ this._dispose = undefined;
+ await dispose();
+ } catch (e) {
+ if (isTargetClosedError(e))
+ return;
+ throw e;
+ }
+ }
+}
+
+export function disposeAll(disposables: Disposable[]) {
+ return Promise.all(disposables.map(d => d.dispose()));
+}
diff --git a/packages/playwright-core/src/client/eventEmitter.ts b/packages/playwright-core/src/client/eventEmitter.ts
index cf2dc55f88..49c38c88ae 100644
--- a/packages/playwright-core/src/client/eventEmitter.ts
+++ b/packages/playwright-core/src/client/eventEmitter.ts
@@ -24,6 +24,7 @@
import type { EventEmitter as EventEmitterType } from 'events';
import type { Platform } from './platform';
+import type { Disposable } from './disposable';
type EventType = string | symbol;
type Listener = (...args: any[]) => any;
@@ -397,10 +398,6 @@ function wrappedListener(l: Listener): Listener {
return (l as any).listener;
}
-export type Disposable = {
- dispose: () => void;
-};
-
class EventsHelper {
static addEventListener(
emitter: EventEmitterType,
@@ -408,7 +405,7 @@ class EventsHelper {
handler: (...args: any[]) => void): Disposable {
emitter.on(eventName, handler);
return {
- dispose: () => emitter.removeListener(eventName, handler)
+ dispose: async () => { emitter.removeListener(eventName, handler); }
};
}
}
diff --git a/packages/playwright-core/src/client/page.ts b/packages/playwright-core/src/client/page.ts
index 46dededd8a..ffc58e30b7 100644
--- a/packages/playwright-core/src/client/page.ts
+++ b/packages/playwright-core/src/client/page.ts
@@ -19,7 +19,7 @@ import { Artifact } from './artifact';
import { ChannelOwner } from './channelOwner';
import { evaluationScript } from './clientHelper';
import { Coverage } from './coverage';
-import { Disposable } from './disposable';
+import { DisposableObject, DisposableStub } from './disposable';
import { Download } from './download';
import { ElementHandle, determineScreenshotType } from './elementHandle';
import { TargetClosedError, isTargetClosedError, parseError, serializeError } from './errors';
@@ -336,13 +336,13 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
const result = await this._channel.exposeBinding({ name });
const binding = (source: structs.BindingSource, ...args: any[]) => callback(...args);
this._bindings.set(name, binding);
- return Disposable.from(result.disposable);
+ return DisposableObject.from(result.disposable);
}
async exposeBinding(name: string, callback: (source: structs.BindingSource, ...args: any[]) => any, options: { handle?: boolean } = {}) {
const result = await this._channel.exposeBinding({ name, needsHandle: options.handle });
this._bindings.set(name, callback);
- return Disposable.from(result.disposable);
+ return DisposableObject.from(result.disposable);
}
async setExtraHTTPHeaders(headers: Headers) {
@@ -510,12 +510,13 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
async addInitScript(script: Function | string | { path?: string, content?: string }, arg?: any) {
const source = await evaluationScript(this._platform, script, arg);
- return Disposable.from((await this._channel.addInitScript({ source })).disposable);
+ return DisposableObject.from((await this._channel.addInitScript({ source })).disposable);
}
- async route(url: URLMatch, handler: RouteHandlerCallback, options: { times?: number } = {}): Promise<void> {
+ async route(url: URLMatch, handler: RouteHandlerCallback, options: { times?: number } = {}): Promise<DisposableStub> {
this._routes.unshift(new RouteHandler(this._platform, this._browserContext._options.baseURL, url, handler, options.times));
await this._updateInterceptionPatterns({ title: 'Route requests' });
+ return new DisposableStub(() => this.unroute(url, handler));
}
async routeFromHAR(har: string, options: { url?: string | RegExp, notFound?: 'abort' | 'fallback', update?: boolean, updateContent?: 'attach' | 'embed', updateMode?: 'minimal' | 'full'} = {}): Promise<void> {
diff --git a/packages/playwright-core/src/mcp/browser/context.ts b/packages/playwright-core/src/mcp/browser/context.ts
index 2490841d2e..c439cc3a36 100644
--- a/packages/playwright-core/src/mcp/browser/context.ts
+++ b/packages/playwright-core/src/mcp/browser/context.ts
@@ -16,6 +16,7 @@
import path from 'path';
+import { disposeAll } from '../../client/disposable';
import { eventsHelper } from '../../client/eventEmitter';
import { debug } from '../../utilsBundle';
import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
@@ -29,7 +30,7 @@ import type * as playwright from '../../..';
import type { FullConfig } from './config';
import type { SessionLog } from './sessionLog';
import type { Tracing } from '../../client/tracing';
-import type { Disposable } from '../../client/eventEmitter';
+import type { Disposable } from '../../client/disposable';
import type { BrowserContext } from '../../client/browserContext';
import type { ClientInfo } from '../sdk/server';
@@ -88,14 +89,12 @@ export class Context {
}
async dispose() {
- for (const disposable of this._disposables)
- disposable.dispose();
- this._disposables = [];
+ disposeAll(this._disposables);
for (const tab of this._tabs)
- tab.dispose();
+ await tab.dispose();
this._tabs.length = 0;
this._currentTab = undefined;
- this.stopVideoRecording();
+ await this.stopVideoRecording();
}
tabs(): Tab[] {
@@ -235,15 +234,17 @@ export class Context {
private async _setupRequestInterception(context: playwright.BrowserContext) {
if (this.config.network?.allowedOrigins?.length) {
- await context.route('**', route => route.abort('blockedbyclient'));
+ this._disposables.push(await context.route('**', route => route.abort('blockedbyclient')));
- for (const origin of this.config.network.allowedOrigins)
- await context.route(originOrHostGlob(origin), route => route.continue());
+ for (const origin of this.config.network.allowedOrigins) {
+ const glob = originOrHostGlob(origin);
+ this._disposables.push(await context.route(glob, route => route.continue()));
+ }
}
if (this.config.network?.blockedOrigins?.length) {
for (const origin of this.config.network.blockedOrigins)
- await context.route(originOrHostGlob(origin), route => route.abort('blockedbyclient'));
+ this._disposables.push(await context.route(originOrHostGlob(origin), route => route.abort('blockedbyclient')));
}
}
@@ -263,9 +264,7 @@ export class Context {
(browserContext as any)._setAllowedDirectories(allRootPaths(this._clientInfo));
}
await this._setupRequestInterception(browserContext);
- for (const page of browserContext.pages())
- this._onPageCreated(page);
- this._disposables.push(eventsHelper.addEventListener(browserContext as BrowserContext, 'page', page => this._onPageCreated(page)));
+
if (this.config.saveTrace) {
await (browserContext.tracing as Tracing).start({
name: 'trace-' + Date.now(),
@@ -281,7 +280,12 @@ export class Context {
}
const rootPath = firstRootPath(this._clientInfo);
for (const initScript of this.config.browser.initScript || [])
- await browserContext.addInitScript({ path: path.resolve(rootPath, initScript) });
+ this._disposables.push(await browserContext.addInitScript({ path: path.resolve(rootPath, initScript) }));
+
+ for (const page of browserContext.pages())
+ this._onPageCreated(page);
+ this._disposables.push(eventsHelper.addEventListener(browserContext as BrowserContext, 'page', page => this._onPageCreated(page)));
+
return browserContext;
}
diff --git a/packages/playwright-core/src/mcp/browser/tab.ts b/packages/playwright-core/src/mcp/browser/tab.ts
index 6f474ceb78..7e31209505 100644
--- a/packages/playwright-core/src/mcp/browser/tab.ts
+++ b/packages/playwright-core/src/mcp/browser/tab.ts
@@ -28,7 +28,7 @@ import { LogFile } from './logFile';
import { ModalState } from './tools/tool';
import { handleDialog } from './tools/dialogs';
import { uploadFile } from './tools/files';
-import type { Disposable } from '../../client/eventEmitter';
+import type { Disposable } from '../../client/disposable';
import type { Context } from './context';
import type { Page } from '../../client/page';
import type { Locator } from '../../client/locator';
@@ -142,9 +142,9 @@ export class Tab extends EventEmitter<TabEventsInterface> {
this.expectTimeoutOptions = { timeout: context.config.timeouts.expect };
}
- dispose() {
+ async dispose() {
for (const disposable of this._disposables)
- disposable.dispose();
+ await disposable.dispose();
this._disposables = [];
this._consoleLog.stop();
}
diff --git a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts
index 82756d1fa8..511b529e87 100644
--- a/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/browserContextDispatcher.ts
@@ -41,7 +41,8 @@ import { JSHandleDispatcher } from './jsHandleDispatcher';
import type { ConsoleMessage } from '../console';
import type { Dialog } from '../dialog';
import type { Request, Response, RouteHandler } from '../network';
-import type { InitScript, Page, PageBinding } from '../page';
+import type { InitScript, Page } from '../page';
+import type { Disposable } from '../disposable';
import type { DispatcherScope } from './dispatcher';
import type * as channels from '@protocol/channels';
import type { Progress } from '@protocol/progress';
@@ -53,8 +54,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
private _context: BrowserContext;
private _subscriptions = new Set<channels.BrowserContextUpdateSubscriptionParams['event']>();
_webSocketInterceptionPatterns: channels.BrowserContextSetWebSocketInterceptionPatternsParams['patterns'] = [];
- private _bindings: PageBinding[] = [];
- private _initScripts: InitScript[] = [];
+ private _disposables: Disposable[] = [];
private _dialogHandler: (dialog: Dialog) => boolean;
private _clockPaused = false;
private _requestInterceptor: RouteHandler;
@@ -239,7 +239,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
this._dispatchEvent('bindingCall', { binding });
return binding.promise();
});
- this._bindings.push(binding);
+ this._disposables.push(binding);
return { disposable: new DisposableDispatcher(this, binding) };
}
@@ -298,7 +298,7 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
async addInitScript(params: channels.BrowserContextAddInitScriptParams, progress: Progress): Promise<channels.BrowserContextAddInitScriptResult> {
const initScript = await this._context.addInitScript(params.source);
- this._initScripts.push(initScript);
+ this._disposables.push(initScript);
return { disposable: new DisposableDispatcher(this, initScript) };
}
@@ -433,12 +433,9 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
this._context.dialogManager.removeDialogHandler(this._dialogHandler);
this._interceptionUrlMatchers = [];
this._context.removeRequestInterceptor(this._requestInterceptor).catch(() => {});
- for (const binding of this._bindings)
- binding.dispose().catch(() => {});
- this._bindings = [];
- for (const initScript of this._initScripts)
- initScript.dispose().catch(() => {});
- this._initScripts = [];
+ for (const disposable of this._disposables)
+ disposable.dispose().catch(() => {});
+ this._disposables = [];
if (this._routeWebSocketInitScript)
WebSocketRouteDispatcher.uninstall(this.connection, this._context, this._routeWebSocketInitScript).catch(() => {});
this._routeWebSocketInitScript = undefined;
diff --git a/packages/playwright-core/src/server/dispatchers/disposableDispatcher.ts b/packages/playwright-core/src/server/dispatchers/disposableDispatcher.ts
index a262e0684e..344f8e41a0 100644
--- a/packages/playwright-core/src/server/dispatchers/disposableDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/disposableDispatcher.ts
@@ -16,15 +16,15 @@
import { Dispatcher } from './dispatcher';
-import type { Disposable } from '../disposable';
+import type { DisposableObject } from '../disposable';
import type { DispatcherScope } from './dispatcher';
import type * as channels from '@protocol/channels';
import type { Progress } from '@protocol/progress';
-export class DisposableDispatcher extends Dispatcher<Disposable, channels.DisposableChannel, DispatcherScope> implements channels.DisposableChannel {
+export class DisposableDispatcher extends Dispatcher<DisposableObject, channels.DisposableChannel, DispatcherScope> implements channels.DisposableChannel {
_type_Disposable = true;
- constructor(scope: DispatcherScope, disposable: Disposable) {
+ constructor(scope: DispatcherScope, disposable: DisposableObject) {
super(scope, disposable, 'Disposable', {});
}
diff --git a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts b/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts
index cd7a40962d..df6fb0e754 100644
--- a/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts
+++ b/packages/playwright-core/src/server/dispatchers/pageDispatcher.ts
@@ -41,7 +41,8 @@ import type { JSHandle } from '../javascript';
import type { BrowserContextDispatcher } from './browserContextDispatcher';
import type { Frame } from '../frames';
import type { RouteHandler } from '../network';
-import type { InitScript, PageBinding } from '../page';
+import type { InitScript } from '../page';
+import type { Disposable } from '../disposable';
import type * as channels from '@protocol/channels';
import type { Progress } from '@protocol/progress';
import type { URLMatch } from '../../utils/isomorphic/urlMatch';
@@ -53,8 +54,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
private _page: Page;
_subscriptions = new Set<channels.PageUpdateSubscriptionParams['event']>();
_webSocketInterceptionPatterns: channels.PageSetWebSocketInterceptionPatternsParams['patterns'] = [];
- private _bindings: PageBinding[] = [];
- private _initScripts: InitScript[] = [];
+ private _disposables: Disposable[] = [];
private _requestInterceptor: RouteHandler;
private _interceptionUrlMatchers: URLMatch[] = [];
private _routeWebSocketInitScript: InitScript | undefined;
@@ -140,7 +140,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
this._dispatchEvent('bindingCall', { binding });
return binding.promise();
});
- this._bindings.push(binding);
+ this._disposables.push(binding);
return { disposable: new DisposableDispatcher(this, binding) };
}
@@ -195,7 +195,7 @@ export class PageDispatcher extends Dispatcher<Page, channels.PageChannel, Brows
async addInitScript(params: channels.PageAddInitScriptParams, progress: Progress): Promise<channels.PageAddInitScriptResult> {
const initScript = await this._page.addInitScript(params.source);
- this._initScripts.push(initScript);
+ this._disposables.push(initScript);
return { disposable: new DisposableDispatcher(this, initScript) };
}
@@ -425,12 +425,9 @@ 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 binding of this._bindings)
- this._page.removeExposedBinding(binding).catch(() => {});
- this._bindings = [];
- for (const initScript of this._initScripts)
- initScript.dispose().catch(() => {});
- this._initScripts = [];
+ for (const disposable of this._disposables)
+ disposable.dispose().catch(() => {});
+ this._disposables = [];
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.ts
index 7d7c708f9a..dd3a04e36a 100644
--- a/packages/playwright-core/src/server/disposable.ts
+++ b/packages/playwright-core/src/server/disposable.ts
@@ -19,7 +19,11 @@ import { SdkObject } from './instrumentation';
import type { Page } from './page';
import type { BrowserContext } from './browserContext';
-export abstract class Disposable extends SdkObject {
+export interface Disposable {
+ dispose(): Promise<void>;
+}
+
+export abstract class DisposableObject extends SdkObject implements Disposable {
readonly parent: Page | BrowserContext;
constructor(parent: Page | BrowserContext) {
diff --git a/packages/playwright-core/src/server/page.ts b/packages/playwright-core/src/server/page.ts
index e756c6bebc..51a91df429 100644
--- a/packages/playwright-core/src/server/page.ts
+++ b/packages/playwright-core/src/server/page.ts
@@ -16,7 +16,7 @@
*/
import { BrowserContext } from './browserContext';
-import { Disposable } from './disposable';
+import { DisposableObject } from './disposable';
import { ConsoleMessage } from './console';
import { TargetClosedError, TimeoutError } from './errors';
import { FileChooser } from './fileChooser';
@@ -933,7 +933,7 @@ export class Worker extends SdkObject<WorkerEventMap> {
}
}
-export class PageBinding extends Disposable {
+export class PageBinding extends DisposableObject {
private static kController = '__playwright__binding__controller__';
static kBindingName = '__playwright__binding__';
@@ -993,7 +993,7 @@ export class PageBinding extends Disposable {
}
}
-export class InitScript extends Disposable {
+export class InitScript extends DisposableObject {
readonly source: string;
constructor(owner: BrowserContext | Page, source: string) {
diff --git a/packages/playwright-core/types/types.d.ts b/packages/playwright-core/types/types.d.ts
index 1dc4b7db36..9227156952 100644
--- a/packages/playwright-core/types/types.d.ts
+++ b/packages/playwright-core/types/types.d.ts
@@ -4147,7 +4147,7 @@ export interface Page {
* How often a route should be used. By default it will be used every time.
*/
times?: number;
- }): Promise<void>;
+ }): Promise<Disposable>;
/**
* If specified the network requests that are made in the page will be served from the HAR file. Read more about
@@ -9469,7 +9469,7 @@ export interface BrowserContext {
* How often a route should be used. By default it will be used every time.
*/
times?: number;
- }): Promise<void>;
+ }): Promise<Disposable>;
/**
* If specified the network requests that are made in the context will be served from the HAR file. Read more about
diff --git a/packages/playwright-ct-core/index.d.ts b/packages/playwright-ct-core/index.d.ts
index f6710ee1f6..a7a3320af0 100644
--- a/packages/playwright-ct-core/index.d.ts
+++ b/packages/playwright-ct-core/index.d.ts
@@ -39,7 +39,7 @@ interface RequestHandler {
}
export interface RouterFixture {
- route(...args: Parameters<BrowserContext['route']>): Promise<void>;
+ route(...args: Parameters<BrowserContext['route']>): Promise<any>;
use(...handlers: RequestHandler[]): Promise<void>;
}