Skip to content

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

feat(api): open api needed for mcp (#39646)

Pavel Feldman43c33729de2c
diff --git a/docs/src/api/class-browser.md b/docs/src/api/class-browser.md
index 7867ce5c8b..21f89f40d2 100644
--- a/docs/src/api/class-browser.md
+++ b/docs/src/api/class-browser.md
@@ -158,6 +158,14 @@ System.Console.WriteLine(browser.Contexts.Count); // prints "1"
Indicates that the browser is connected.
+## method: Browser.launchOptions
+* since: v1.59
+* langs: js
+- returns: <[Object]>
+
+Returns the launch options that were used to launch this browser. The return type matches the options
+accepted by [`method: BrowserType.launch`].
+
## async method: Browser.newBrowserCDPSession
* since: v1.11
- returns: <[CDPSession]>
@@ -382,6 +390,14 @@ This API controls [Chromium Tracing](https://www.chromium.org/developers/how-tos
Returns the buffer with trace data.
+## method: Browser.userDataDir
+* since: v1.59
+* langs: js
+- returns: <[null]|[string]>
+
+Returns the user data directory that the browser was launched with, or `null` if the browser was
+launched without a persistent context.
+
## method: Browser.version
* since: v1.8
- returns: <[string]>
diff --git a/docs/src/api/class-browsercontext.md b/docs/src/api/class-browsercontext.md
index 24f07b5a67..72a8f13829 100644
--- a/docs/src/api/class-browsercontext.md
+++ b/docs/src/api/class-browsercontext.md
@@ -968,6 +968,12 @@ Here are some permissions that may be supported by some browsers:
The [origin] to grant permissions to, e.g. "https://example.com".
+## method: BrowserContext.isClosedOrClosing
+* since: v1.59
+- returns: <[boolean]>
+
+Indicates that the browser context is in the process of closing or has already been closed.
+
## async method: BrowserContext.newCDPSession
* since: v1.11
- returns: <[CDPSession]>
diff --git a/docs/src/api/class-locator.md b/docs/src/api/class-locator.md
index 8d0091486b..91ceabfbf8 100644
--- a/docs/src/api/class-locator.md
+++ b/docs/src/api/class-locator.md
@@ -1803,6 +1803,12 @@ var banana = await page.GetByRole(AriaRole.Listitem).Last(1);
### option: Locator.locator.hasNotText = %%-locator-option-has-not-text-%%
* since: v1.33
+## async method: Locator.normalize
+* since: v1.59
+- returns: <[Locator]>
+
+Returns a new locator that uses best practices for referencing the matched element, prioritizing test ids,
+aria roles, and other user-facing attributes over CSS selectors. This is useful for converting implementation-detail selectors into more resilient, human-readable locators.
## method: Locator.nth
* since: v1.14
diff --git a/docs/src/api/class-page.md b/docs/src/api/class-page.md
index cd6d1e9d92..f1e38b9a74 100644
--- a/docs/src/api/class-page.md
+++ b/docs/src/api/class-page.md
@@ -4212,6 +4212,24 @@ Page width in pixels.
Page height in pixels.
+## async method: Page.snapshotForAI
+* since: v1.59
+- returns: <[Object]>
+ - `full` <[string]> Full accessibility snapshot of the page.
+ - `incremental` ?<[string]> Incremental snapshot containing only changes since the last tracked snapshot, when using the [`option: Page.snapshotForAI.track`] option.
+
+Returns an accessibility snapshot of the page optimized for AI consumption.
+
+### option: Page.snapshotForAI.timeout = %%-input-timeout-%%
+* since: v1.59
+
+### option: Page.snapshotForAI.track
+* since: v1.59
+- `track` <[string]>
+
+When specified, enables incremental snapshots. Subsequent calls with the same track name will return
+an incremental snapshot containing only changes since the last call.
+
## async method: Page.tap
* since: v1.8
* discouraged: Use locator-based [`method: Locator.tap`] instead. Read more about [locators](../locators.md).
diff --git a/docs/src/api/class-tracing.md b/docs/src/api/class-tracing.md
index 0528891fdc..704409a170 100644
--- a/docs/src/api/class-tracing.md
+++ b/docs/src/api/class-tracing.md
@@ -176,6 +176,14 @@ and by ':' on other platforms).
Trace name to be shown in the Trace Viewer.
+### option: Tracing.start.live
+* since: v1.59
+- `live` <[boolean]>
+
+When enabled, the trace is written to an unarchived file that is updated in real time as actions occur,
+instead of caching changes and archiving them into a zip file at the end. This is useful for live trace
+viewing during test execution.
+
## async method: Tracing.startChunk
* since: v1.15
diff --git a/packages/playwright-client/types/types.d.ts b/packages/playwright-client/types/types.d.ts
index ec64b02157..21d6444d37 100644
--- a/packages/playwright-client/types/types.d.ts
+++ b/packages/playwright-client/types/types.d.ts
@@ -4533,6 +4533,29 @@ export interface Page {
height: number;
}): Promise<void>;
+ /**
+ * Returns an accessibility snapshot of the page optimized for AI consumption.
+ * @param options
+ */
+ snapshotForAI(options?: {
+ /**
+ * When specified, enables incremental snapshots. Subsequent calls with the same track name will return an incremental
+ * snapshot containing only changes since the last call.
+ */
+ track?: string;
+ }): Promise<{
+ /**
+ * Full accessibility snapshot of the page.
+ */
+ full: string;
+
+ /**
+ * Incremental snapshot containing only changes since the last tracked snapshot, when using the
+ * [`track`](https://playwright.dev/docs/api/class-page#page-snapshot-for-ai-option-track) option.
+ */
+ incremental?: string;
+ }>;
+
/**
* **NOTE** Use locator-based [locator.tap([options])](https://playwright.dev/docs/api/class-locator#locator-tap) instead. Read
* more about [locators](https://playwright.dev/docs/locators).
@@ -9096,6 +9119,11 @@ export interface BrowserContext {
origin?: string;
}): Promise<void>;
+ /**
+ * Indicates that the browser context is in the process of closing or has already been closed.
+ */
+ isClosedOrClosing(): boolean;
+
/**
* **NOTE** CDP sessions are only supported on Chromium-based browsers.
*
@@ -9801,6 +9829,12 @@ export interface Browser {
*/
isConnected(): boolean;
+ /**
+ * Returns the launch options that were used to launch this browser. The return type matches the options accepted by
+ * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch).
+ */
+ launchOptions(): Object;
+
/**
* **NOTE** CDP Sessions are only supported on Chromium-based browsers.
*
@@ -10358,6 +10392,12 @@ export interface Browser {
*/
stopTracing(): Promise<Buffer>;
+ /**
+ * Returns the user data directory that the browser was launched with, or `null` if the browser was launched without a
+ * persistent context.
+ */
+ userDataDir(): null|string;
+
/**
* Returns the browser version.
*/
@@ -14150,6 +14190,13 @@ export interface Locator {
hasText?: string|RegExp;
}): Locator;
+ /**
+ * Returns a new locator that uses best practices for referencing the matched element, prioritizing test ids, aria
+ * roles, and other user-facing attributes over CSS selectors. This is useful for converting implementation-detail
+ * selectors into more resilient, human-readable locators.
+ */
+ normalize(): Promise<Locator>;
+
/**
* Returns locator to the n-th matching element. It's zero based, `nth(0)` selects the first element.
*
@@ -21830,6 +21877,13 @@ export interface Tracing {
* @param options
*/
start(options?: {
+ /**
+ * When enabled, the trace is written to an unarchived file that is updated in real time as actions occur, instead of
+ * caching changes and archiving them into a zip file at the end. This is useful for live trace viewing during test
+ * execution.
+ */
+ live?: boolean;
+
/**
* If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the
* [`tracesDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-traces-dir) directory
diff --git a/packages/playwright-core/src/client/browser.ts b/packages/playwright-core/src/client/browser.ts
index df4f9aff42..d9f240084f 100644
--- a/packages/playwright-core/src/client/browser.ts
+++ b/packages/playwright-core/src/client/browser.ts
@@ -34,8 +34,8 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
private _closedPromise: Promise<void>;
_shouldCloseConnectionOnClose = false;
_browserType!: BrowserType;
- _options: LaunchOptions = {};
- _userDataDir: string | undefined;
+ private _options: LaunchOptions = {};
+ private _userDataDir: string | undefined;
readonly _name: string;
readonly _browserName: 'chromium' | 'webkit' | 'firefox';
private _path: string | undefined;
@@ -152,6 +152,14 @@ export class Browser extends ChannelOwner<channels.BrowserChannel> implements ap
return this._isConnected;
}
+ launchOptions(): LaunchOptions {
+ return this._options;
+ }
+
+ userDataDir(): string | null {
+ return this._userDataDir ?? null;
+ }
+
async newBrowserCDPSession(): Promise<api.CDPSession> {
return CDPSession.from((await this._channel.newBrowserCDPSession()).session);
}
diff --git a/packages/playwright-core/src/client/browserContext.ts b/packages/playwright-core/src/client/browserContext.ts
index 99c006eb81..dac603d94f 100644
--- a/packages/playwright-core/src/client/browserContext.ts
+++ b/packages/playwright-core/src/client/browserContext.ts
@@ -75,7 +75,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
readonly _serviceWorkers = new Set<Worker>();
private _harRecorders = new Map<string, { path: string, content: 'embed' | 'attach' | 'omit' | undefined }>();
- _closingStatus: 'none' | 'closing' | 'closed' = 'none';
+ private _closingStatus: 'none' | 'closing' | 'closed' = 'none';
private _closeReason: string | undefined;
private _harRouters: HarRouter[] = [];
private _onRecorderEventSink: RecorderEventSink | undefined;
@@ -231,7 +231,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
const routeHandlers = this._routes.slice();
for (const routeHandler of routeHandlers) {
// If the page or the context was closed we stall all requests right away.
- if (page?._closeWasCalled || this._closingStatus !== 'none')
+ if (page?._closeWasCalled || this.isClosedOrClosing())
return;
if (!routeHandler.matches(route.request().url()))
continue;
@@ -293,6 +293,10 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
return [...this._pages];
}
+ isClosedOrClosing(): boolean {
+ return this._closingStatus !== 'none';
+ }
+
async newPage(): Promise<Page> {
if (this._ownerPage)
throw new Error('Please use browser.newContext()');
@@ -511,7 +515,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
}
async close(options: { reason?: string } = {}): Promise<void> {
- if (this._closingStatus !== 'none')
+ if (this.isClosedOrClosing())
return;
this._closeReason = options.reason;
this._closingStatus = 'closing';
diff --git a/packages/playwright-core/src/client/eventEmitter.ts b/packages/playwright-core/src/client/eventEmitter.ts
index ecb9277019..e1c08619ec 100644
--- a/packages/playwright-core/src/client/eventEmitter.ts
+++ b/packages/playwright-core/src/client/eventEmitter.ts
@@ -24,12 +24,6 @@
import type { EventEmitter as EventEmitterType } from 'events';
import type { Platform } from './platform';
-import type { Disposable } from './disposable';
-
-type EventEmitterLike = {
- on(eventName: string | symbol, handler: (...args: any[]) => unknown): unknown;
- removeListener(eventName: string | symbol, handler: (...args: any[]) => unknown): unknown;
-};
type EventType = string | symbol;
type Listener = (...args: any[]) => any;
@@ -402,17 +396,3 @@ function unwrapListeners(arr: Listener[]): Listener[] {
function wrappedListener(l: Listener): Listener {
return (l as any).listener;
}
-
-class EventsHelper {
- static addEventListener(
- emitter: EventEmitterLike,
- eventName: (string | symbol),
- handler: (...args: any[]) => any): Disposable {
- emitter.on(eventName, handler);
- return {
- dispose: async () => { emitter.removeListener(eventName, handler); }
- };
- }
-}
-
-export const eventsHelper = EventsHelper;
diff --git a/packages/playwright-core/src/client/frame.ts b/packages/playwright-core/src/client/frame.ts
index 0d52541e4d..b6eca93584 100644
--- a/packages/playwright-core/src/client/frame.ts
+++ b/packages/playwright-core/src/client/frame.ts
@@ -200,11 +200,6 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr
return parseResult(result.value);
}
- async _evaluateFunction(functionDeclaration: string) {
- const result = await this._channel.evaluateExpression({ expression: functionDeclaration, isFunction: true, arg: serializeArgument(undefined) });
- return parseResult(result.value);
- }
-
async _evaluateExposeUtilityScript<R, Arg>(pageFunction: structs.PageFunction<Arg, R>, arg?: Arg): Promise<R> {
assertMaxArguments(arguments.length, 2);
const result = await this._channel.evaluateExpression({ expression: String(pageFunction), isFunction: typeof pageFunction === 'function', arg: serializeArgument(arg) });
diff --git a/packages/playwright-core/src/client/jsHandle.ts b/packages/playwright-core/src/client/jsHandle.ts
index 2a898c9674..62a54950d5 100644
--- a/packages/playwright-core/src/client/jsHandle.ts
+++ b/packages/playwright-core/src/client/jsHandle.ts
@@ -41,11 +41,6 @@ export class JSHandle<T = any> extends ChannelOwner<channels.JSHandleChannel> im
return parseResult(result.value);
}
- async _evaluateFunction(functionDeclaration: string) {
- const result = await this._channel.evaluateExpression({ expression: functionDeclaration, isFunction: true, arg: serializeArgument(undefined) });
- return parseResult(result.value);
- }
-
async evaluateHandle<R, Arg>(pageFunction: structs.PageFunctionOn<T, Arg, R>, arg?: Arg): Promise<structs.SmartHandle<R>> {
const result = await this._channel.evaluateExpressionHandle({ expression: String(pageFunction), isFunction: typeof pageFunction === 'function', arg: serializeArgument(arg) });
return JSHandle.from(result.handle) as any as structs.SmartHandle<R>;
diff --git a/packages/playwright-core/src/client/locator.ts b/packages/playwright-core/src/client/locator.ts
index 169ba66d75..5c30024eb3 100644
--- a/packages/playwright-core/src/client/locator.ts
+++ b/packages/playwright-core/src/client/locator.ts
@@ -128,10 +128,6 @@ export class Locator implements api.Locator {
return await this._withElement(h => h.evaluate(pageFunction, arg), { title: 'Evaluate', timeout: options?.timeout });
}
- async _evaluateFunction(functionDeclaration: string, options?: TimeoutOptions) {
- return await this._withElement(h => h._evaluateFunction(functionDeclaration), { title: 'Evaluate', timeout: options?.timeout });
- }
-
async evaluateAll<R, Arg>(pageFunction: structs.PageFunctionOn<Element[], Arg, R>, arg?: Arg): Promise<R> {
return await this._frame.$$eval(this._selector, pageFunction, arg);
}
@@ -258,13 +254,9 @@ export class Locator implements api.Locator {
return await this._frame._queryCount(this._selector, _options);
}
- async _resolveSelector(): Promise<{ resolvedSelector: string }> {
- return await this._frame._channel.resolveSelector({ selector: this._selector });
- }
-
- async _resolveForCode(): Promise<string> {
- const { resolvedSelector } = await this._resolveSelector();
- return asLocatorDescription('javascript', resolvedSelector);
+ async normalize(): Promise<Locator> {
+ const { resolvedSelector } = await this._frame._channel.resolveSelector({ selector: this._selector });
+ return new Locator(this._frame, resolvedSelector);
}
async getAttribute(name: string, options?: TimeoutOptions): Promise<string | null> {
diff --git a/packages/playwright-core/src/client/page.ts b/packages/playwright-core/src/client/page.ts
index 801d856d7f..143b348222 100644
--- a/packages/playwright-core/src/client/page.ts
+++ b/packages/playwright-core/src/client/page.ts
@@ -191,7 +191,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
const routeHandlers = this._routes.slice();
for (const routeHandler of routeHandlers) {
// If the page was closed we stall all requests right away.
- if (this._closeWasCalled || this._browserContext._closingStatus !== 'none')
+ if (this._closeWasCalled || this._browserContext.isClosedOrClosing())
return;
if (!routeHandler.matches(route.request().url()))
continue;
@@ -511,10 +511,6 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
return await this._mainFrame.evaluate(pageFunction, arg);
}
- async _evaluateFunction(functionDeclaration: string) {
- return this._mainFrame._evaluateFunction(functionDeclaration);
- }
-
async addInitScript(script: Function | string | { path?: string, content?: string }, arg?: any) {
const source = await evaluationScript(this._platform, script, arg);
return DisposableObject.from((await this._channel.addInitScript({ source })).disposable);
@@ -859,7 +855,7 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
return result.pdf;
}
- async _snapshotForAI(options: TimeoutOptions & { track?: string } = {}): Promise<{ full: string, incremental?: string }> {
+ async snapshotForAI(options: TimeoutOptions & { track?: string } = {}): Promise<{ full: string, incremental?: string }> {
return await this._channel.snapshotForAI({ timeout: this._timeoutSettings.timeout(options), track: options.track });
}
diff --git a/packages/playwright-core/src/client/tracing.ts b/packages/playwright-core/src/client/tracing.ts
index f6f02a6fc7..cd5e06ff5d 100644
--- a/packages/playwright-core/src/client/tracing.ts
+++ b/packages/playwright-core/src/client/tracing.ts
@@ -36,15 +36,15 @@ export class Tracing extends ChannelOwner<channels.TracingChannel> implements ap
super(parent, type, guid, initializer);
}
- async start(options: { name?: string, title?: string, snapshots?: boolean, screenshots?: boolean, sources?: boolean, _live?: boolean } = {}) {
+ async start(options: { name?: string, title?: string, snapshots?: boolean, screenshots?: boolean, sources?: boolean, live?: boolean } = {}) {
await this._wrapApiCall(async () => {
this._includeSources = !!options.sources;
- this._isLive = !!options._live;
+ this._isLive = !!options.live;
await this._channel.tracingStart({
name: options.name,
snapshots: options.snapshots,
screenshots: options.screenshots,
- live: options._live,
+ live: options.live,
});
const { traceName } = await this._channel.tracingStartChunk({ name: options.name, title: options.title });
await this._startCollectingStacks(traceName, this._isLive);
diff --git a/packages/playwright-core/src/server/utils/disposable.ts b/packages/playwright-core/src/server/utils/disposable.ts
new file mode 100644
index 0000000000..cb72f656b9
--- /dev/null
+++ b/packages/playwright-core/src/server/utils/disposable.ts
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export interface Disposable {
+ dispose: () => Promise<void>;
+}
+
+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/server/utils/eventsHelper.ts b/packages/playwright-core/src/server/utils/eventsHelper.ts
index a46a6d7d47..e682c08a0a 100644
--- a/packages/playwright-core/src/server/utils/eventsHelper.ts
+++ b/packages/playwright-core/src/server/utils/eventsHelper.ts
@@ -15,25 +15,29 @@
* limitations under the License.
*/
-import type { EventEmitter } from 'events';
+type EventEmitterLike = {
+ on(eventName: string | symbol, handler: (...args: any[]) => unknown): unknown;
+ removeListener(eventName: string | symbol, handler: (...args: any[]) => unknown): unknown;
+};
export type RegisteredListener = {
- emitter: EventEmitter;
+ emitter: EventEmitterLike;
eventName: (string | symbol);
handler: (...args: any[]) => void;
+ dispose: () => Promise<void>;
};
class EventsHelper {
static addEventListener(
- emitter: EventEmitter,
+ emitter: EventEmitterLike,
eventName: (string | symbol),
handler: (...args: any[]) => void): RegisteredListener {
emitter.on(eventName, handler);
- return { emitter, eventName, handler };
+ return { emitter, eventName, handler, dispose: async () => { emitter.removeListener(eventName, handler); } };
}
static removeEventListeners(listeners: Array<{
- emitter: EventEmitter;
+ emitter: EventEmitterLike;
eventName: (string | symbol);
handler: (...args: any[]) => void;
}>) {
diff --git a/packages/playwright-core/src/tools/backend/DEPS.list b/packages/playwright-core/src/tools/backend/DEPS.list
index 6a31e10942..a2dcb1352a 100644
--- a/packages/playwright-core/src/tools/backend/DEPS.list
+++ b/packages/playwright-core/src/tools/backend/DEPS.list
@@ -2,7 +2,8 @@
../../..
../..
../../mcpBundle.ts
+../../server/utils/
../../utils/
../../utils/isomorphic/
../../utilsBundle.ts
-../../client/
+../utils/
diff --git a/packages/playwright-core/src/tools/backend/context.ts b/packages/playwright-core/src/tools/backend/context.ts
index 4f6144215b..6fa101c70b 100644
--- a/packages/playwright-core/src/tools/backend/context.ts
+++ b/packages/playwright-core/src/tools/backend/context.ts
@@ -17,19 +17,17 @@
import fs from 'fs';
import path from 'path';
-import { disposeAll } from '../../client/disposable';
-import { eventsHelper } from '../../client/eventEmitter';
import { debug } from '../../utilsBundle';
import { escapeWithQuotes } from '../../utils/isomorphic/stringUtils';
import { selectors } from '../../..';
import { Tab } from './tab';
+import { disposeAll } from '../../server/utils/disposable';
+import { eventsHelper } from '../../server/utils/eventsHelper';
import type * as playwright from '../../..';
import type { SessionLog } from './sessionLog';
-import type { Tracing } from '../../client/tracing';
-import type { Disposable } from '../../client/disposable';
-import type { BrowserContext } from '../../client/browserContext';
+import type { Disposable } from '../../server/utils/disposable';
import type { ToolCapability } from './tool';
const testDebug = debug('pw:mcp:test');
@@ -293,15 +291,15 @@ export class Context {
await this._setupRequestInterception(browserContext);
if (this.config.saveTrace) {
- await (browserContext.tracing as Tracing).start({
+ await browserContext.tracing.start({
name: 'trace-' + Date.now(),
screenshots: true,
snapshots: true,
- _live: true,
+ live: true,
});
this._disposables.push({
dispose: async () => {
- await (browserContext.tracing as Tracing).stop();
+ await browserContext.tracing.stop();
},
});
}
@@ -310,7 +308,7 @@ export class Context {
for (const page of browserContext.pages())
this._onPageCreated(page);
- this._disposables.push(eventsHelper.addEventListener(browserContext as BrowserContext, 'page', page => this._onPageCreated(page)));
+ this._disposables.push(eventsHelper.addEventListener(browserContext, 'page', page => this._onPageCreated(page)));
return browserContext;
}
diff --git a/packages/playwright-core/src/tools/backend/devtools.ts b/packages/playwright-core/src/tools/backend/devtools.ts
deleted file mode 100644
index 2721fe3d45..0000000000
--- a/packages/playwright-core/src/tools/backend/devtools.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { z } from '../../mcpBundle';
-import { defineTool } from './tool';
-
-const devtoolsConnect = defineTool({
- capability: 'devtools',
- skillOnly: true,
-
- schema: {
- name: 'browser_devtools_start',
- title: 'Start browser DevTools',
- description: 'Start browser DevTools',
- inputSchema: z.object({}),
- type: 'action',
- },
-
- handle: async (context, params, response) => {
- const browserContext = await context.ensureBrowserContext();
- const { url } = await (browserContext as any)._devtoolsStart();
- response.addTextResult('Server is listening on: ' + url);
- },
-});
-
-export default [devtoolsConnect];
diff --git a/packages/playwright-core/src/tools/backend/evaluate.ts b/packages/playwright-core/src/tools/backend/evaluate.ts
index c33e6eb2bf..6e0ce373f4 100644
--- a/packages/playwright-core/src/tools/backend/evaluate.ts
+++ b/packages/playwright-core/src/tools/backend/evaluate.ts
@@ -50,8 +50,9 @@ const evaluate = defineTabTool({
}
await tab.waitForCompletion(async () => {
- const receiver = locator?.locator ?? tab.page;
- const result = await receiver._evaluateFunction(params.function);
+ const func = new Function() as any;
+ func.toString = () => params.function;
+ const result = locator?.locator ? await locator?.locator.evaluate(func) : await tab.page.evaluate(func);
const text = JSON.stringify(result, null, 2) || 'undefined';
response.addTextResult(text);
});
diff --git a/packages/playwright-core/src/tools/backend/tab.ts b/packages/playwright-core/src/tools/backend/tab.ts
index 1b350fcac8..cf78e6005d 100644
--- a/packages/playwright-core/src/tools/backend/tab.ts
+++ b/packages/playwright-core/src/tools/backend/tab.ts
@@ -21,18 +21,16 @@ import { asLocator } from '../../utils/isomorphic/locatorGenerators';
import { ManualPromise } from '../../utils/isomorphic/manualPromise';
import { debug } from '../../utilsBundle';
-import { eventsHelper } from '../../client/eventEmitter';
+import { eventsHelper } from '../../server/utils/eventsHelper';
+import { disposeAll } from '../../server/utils/disposable';
import { callOnPageNoTrace, waitForCompletion, eventWaiter } from './utils';
import { LogFile } from './logFile';
import { ModalState } from './tool';
import { handleDialog } from './dialogs';
import { uploadFile } from './files';
-import { disposeAll } from '../../client/disposable';
-import type { Disposable } from '../../client/disposable';
+import type { Disposable } from '../../server/utils/disposable';
import type { Context, ContextConfig } from './context';
-import type { Page } from '../../client/page';
-import type { Locator } from '../../client/locator';
import type * as playwright from '../../..';
const TabEvents = {
@@ -93,7 +91,7 @@ type TabSnapshot = {
export class Tab extends EventEmitter<TabEventsInterface> {
readonly context: Context;
- readonly page: Page;
+ readonly page: playwright.Page;
private _lastHeader: TabHeader = { title: 'about:blank', url: 'about:blank', current: false, console: { total: 0, warnings: 0, errors: 0 } };
private _downloads: Download[] = [];
private _requests: playwright.Request[] = [];
@@ -111,9 +109,9 @@ export class Tab extends EventEmitter<TabEventsInterface> {
constructor(context: Context, page: playwright.Page, onPageClose: (tab: Tab) => void) {
super();
this.context = context;
- this.page = page as Page;
+ this.page = page;
this._onPageClose = onPageClose;
- const p = page as Page;
+ const p = page;
this._disposables = [
eventsHelper.addEventListener(p, 'console', event => this._handleConsoleMessage(messageToConsoleMessage(event))),
eventsHelper.addEventListener(p, 'pageerror', error => this._handleConsoleMessage(pageErrorToConsoleMessage(error))),
@@ -378,7 +376,7 @@ export class Tab extends EventEmitter<TabEventsInterface> {
await this._initializedPromise;
let tabSnapshot: TabSnapshot | undefined;
const modalStates = await this._raceAgainstModalStates(async () => {
- const snapshot = await this.page._snapshotForAI({ track: 'response' });
+ const snapshot = await this.page.snapshotForAI({ track: 'response' });
tabSnapshot = {
ariaSnapshot: snapshot.full,
ariaSnapshotDiff: this._needsFullSnapshot ? undefined : snapshot.incremental,
@@ -429,18 +427,18 @@ export class Tab extends EventEmitter<TabEventsInterface> {
await this._raceAgainstModalStates(() => waitForCompletion(this, callback));
}
- async refLocator(params: { element?: string, ref: string, selector?: string }): Promise<{ locator: Locator, resolved: string }> {
+ async refLocator(params: { element?: string, ref: string, selector?: string }): Promise<{ locator: playwright.Locator, resolved: string }> {
await this._initializedPromise;
return (await this.refLocators([params]))[0];
}
- async refLocators(params: { element?: string, ref: string, selector?: string }[]): Promise<{ locator: Locator, resolved: string }[]> {
+ async refLocators(params: { element?: string, ref: string, selector?: string }[]): Promise<{ locator: playwright.Locator, resolved: string }[]> {
await this._initializedPromise;
return Promise.all(params.map(async param => {
if (param.selector) {
const locator = this.page.locator(param.selector);
try {
- await locator._resolveSelector();
+ await locator.normalize();
} catch {
throw new Error(`Selector ${param.selector} does not match any elements.`);
}
@@ -450,8 +448,8 @@ export class Tab extends EventEmitter<TabEventsInterface> {
let locator = this.page.locator(`aria-ref=${param.ref}`);
if (param.element)
locator = locator.describe(param.element);
- const { resolvedSelector } = await locator._resolveSelector();
- return { locator, resolved: asLocator('javascript', resolvedSelector) };
+ const resolved = await locator.normalize();
+ return { locator, resolved: resolved.toString() };
} catch (e) {
throw new Error(`Ref ${param.ref} not found in the current page snapshot. Try capturing new snapshot.`);
}
diff --git a/packages/playwright-core/src/tools/backend/tools.ts b/packages/playwright-core/src/tools/backend/tools.ts
index de8d3eda86..fe292bd35e 100644
--- a/packages/playwright-core/src/tools/backend/tools.ts
+++ b/packages/playwright-core/src/tools/backend/tools.ts
@@ -20,7 +20,6 @@ import common from './common';
import config from './config';
import console from './console';
import cookies from './cookies';
-import devtools from './devtools';
import dialogs from './dialogs';
import evaluate from './evaluate';
import files from './files';
@@ -50,7 +49,6 @@ export const browserTools: Tool<any>[] = [
...config,
...console,
...cookies,
- ...devtools,
...dialogs,
...evaluate,
...files,
diff --git a/packages/playwright-core/src/tools/backend/tracing.ts b/packages/playwright-core/src/tools/backend/tracing.ts
index b141131be6..9b1eeeba15 100644
--- a/packages/playwright-core/src/tools/backend/tracing.ts
+++ b/packages/playwright-core/src/tools/backend/tracing.ts
@@ -17,7 +17,6 @@
import { z } from '../../mcpBundle';
import { defineTool } from './tool';
-import type { Tracing } from '../../client/tracing';
const tracingStart = defineTool({
capability: 'devtools',
@@ -34,11 +33,11 @@ const tracingStart = defineTool({
const browserContext = await context.ensureBrowserContext();
const tracesDir = await context.outputFile({ prefix: '', suggestedFilename: `traces`, ext: '' }, { origin: 'code' });
const name = 'trace-' + Date.now();
- await (browserContext.tracing as Tracing).start({
+ await browserContext.tracing.start({
name,
screenshots: true,
snapshots: true,
- _live: true,
+ live: true,
});
response.addTextResult(`Trace recording started`);
response.addFileLink('Action log', `${tracesDir}/${name}.trace`);
diff --git a/packages/playwright-core/src/tools/backend/verify.ts b/packages/playwright-core/src/tools/backend/verify.ts
index 09d33f5209..5e53bf68b5 100644
--- a/packages/playwright-core/src/tools/backend/verify.ts
+++ b/packages/playwright-core/src/tools/backend/verify.ts
@@ -36,7 +36,7 @@ const verifyElement = defineTabTool({
for (const frame of tab.page.frames()) {
const locator = frame.getByRole(params.role as any, { name: params.accessibleName });
if (await locator.count() > 0) {
- const resolved = await locator._resolveForCode();
+ const resolved = await locator.normalize();
response.addCode(`await expect(page.${resolved}).toBeVisible();`);
response.addTextResult('Done');
return;
@@ -62,7 +62,7 @@ const verifyText = defineTabTool({
for (const frame of tab.page.frames()) {
const locator = frame.getByText(params.text).filter({ visible: true });
if (await locator.count() > 0) {
- const resolved = await locator._resolveForCode();
+ const resolved = await locator.normalize();
response.addCode(`await expect(page.${resolved}).toBeVisible();`);
response.addTextResult('Done');
return;
diff --git a/packages/playwright-core/src/tools/cli-daemon/commands.ts b/packages/playwright-core/src/tools/cli-daemon/commands.ts
index d5c25bf7b0..98e691f02f 100644
--- a/packages/playwright-core/src/tools/cli-daemon/commands.ts
+++ b/packages/playwright-core/src/tools/cli-daemon/commands.ts
@@ -796,15 +796,6 @@ const devtoolsShow = declareCommand({
toolParams: () => ({}),
});
-const devtoolsStart = declareCommand({
- name: 'devtools-start',
- description: 'Show browser DevTools',
- category: 'devtools',
- args: z.object({}),
- toolName: 'browser_devtools_start',
- toolParams: () => ({}),
-});
-
// Sessions
const sessionList = declareCommand({
@@ -981,7 +972,6 @@ const commandsArray: AnyCommandSchema[] = [
videoStart,
videoStop,
devtoolsShow,
- devtoolsStart,
// session category
sessionList,
diff --git a/packages/playwright-core/src/tools/cli-daemon/daemon.ts b/packages/playwright-core/src/tools/cli-daemon/daemon.ts
index cf106166da..5cfe12bd89 100644
--- a/packages/playwright-core/src/tools/cli-daemon/daemon.ts
+++ b/packages/playwright-core/src/tools/cli-daemon/daemon.ts
@@ -35,7 +35,6 @@ import { createClientInfo } from '../cli-client/registry';
import type * as playwright from '../../..';
import type { SessionConfig, ClientInfo } from '../cli-client/registry';
-import type { BrowserContext } from '../../client/browserContext';
import type { CallToolRequest, CallToolResult } from '../backend/tool';
import type { ContextConfig } from '../backend/context';
@@ -80,7 +79,7 @@ export async function startCliDaemonServer(
await fs.promises.mkdir(path.dirname(socketPath), { recursive: true });
- if ((browserContext as BrowserContext)._closingStatus !== 'none')
+ if (browserContext.isClosedOrClosing())
throw new Error('Browser context was closed before the daemon could start');
const server = net.createServer(socket => {
@@ -177,7 +176,7 @@ function createSessionConfig(clientInfo: ClientInfo, sessionName: string, browse
persistent?: boolean,
exitOnStop?: boolean,
} = {}): SessionConfig {
- const bc = browserContext as BrowserContext;
+ const browser = browserContext.browser()!;
return {
name: sessionName,
version: clientInfo.version,
@@ -186,9 +185,9 @@ function createSessionConfig(clientInfo: ClientInfo, sessionName: string, browse
workspaceDir: clientInfo.workspaceDir,
cli: { persistent: options.persistent },
browser: {
- browserName: bc.browser()!.browserType().name(),
- launchOptions: bc.browser()!._options,
- userDataDir: bc.browser()?._userDataDir,
+ browserName: browser.browserType().name(),
+ launchOptions: browser.launchOptions(),
+ userDataDir: browser.userDataDir() ?? undefined,
},
};
}
diff --git a/packages/playwright-core/src/tools/dashboard/DEPS.list b/packages/playwright-core/src/tools/dashboard/DEPS.list
index 97630bfa6a..232118337c 100644
--- a/packages/playwright-core/src/tools/dashboard/DEPS.list
+++ b/packages/playwright-core/src/tools/dashboard/DEPS.list
@@ -1,9 +1,9 @@
[*]
../../..
../../
+../../client/connect.ts
../../server/registry/index.ts
../../server/utils/
../../serverRegistry.ts
../../utils/
-../../client/connect.ts
-../../client/eventEmitter.ts
+../utils/
diff --git a/packages/playwright-core/src/tools/dashboard/dashboardController.ts b/packages/playwright-core/src/tools/dashboard/dashboardController.ts
index 0cc6438c29..b6fa67eb26 100644
--- a/packages/playwright-core/src/tools/dashboard/dashboardController.ts
+++ b/packages/playwright-core/src/tools/dashboard/dashboardController.ts
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-import { eventsHelper } from '../../client/eventEmitter';
+import { eventsHelper } from '../../server/utils/eventsHelper';
import { connectToBrowserAcrossVersions } from '../../client/connect';
import type * as api from '../../..';
import type { Transport } from '../../server/utils/httpServer';
-import type { DashboardChannel, DashboardChannelEvents, Tab } from '../../../../dashboard/src/dashboardChannel';
+import type { DashboardChannel, DashboardChannelEvents, Tab } from '@dashboard/dashboardChannel';
import type { BrowserDescriptor } from '../../serverRegistry';
export class DashboardConnection implements Transport, DashboardChannel {
diff --git a/packages/playwright-core/src/tools/mcp/DEPS.list b/packages/playwright-core/src/tools/mcp/DEPS.list
index cf8eca0e5a..bf1c164100 100644
--- a/packages/playwright-core/src/tools/mcp/DEPS.list
+++ b/packages/playwright-core/src/tools/mcp/DEPS.list
@@ -1,6 +1,7 @@
[*]
../../..
../../
+../../client/connect.ts
../utils/mcp/
../backend/
../../utils/
@@ -10,5 +11,4 @@
../../server/
../../server/registry/
../../server/utils/
-../../client/
../../serverRegistry.ts
diff --git a/packages/playwright-core/src/tools/mcp/browserFactory.ts b/packages/playwright-core/src/tools/mcp/browserFactory.ts
index a56575ddec..06d927e2af 100644
--- a/packages/playwright-core/src/tools/mcp/browserFactory.ts
+++ b/packages/playwright-core/src/tools/mcp/browserFactory.ts
@@ -28,7 +28,7 @@ import { connectToBrowser, connectToBrowserAcrossVersions } from '../../client/c
import { serverRegistry } from '../../serverRegistry';
import type { FullConfig } from './config';
-import type { LaunchOptions, BrowserContextOptions, ConnectOptions } from '../../client/types';
+import type { ConnectOptions } from '../../client/types';
import type { ClientInfo } from '../utils/mcp/server';
import type { Playwright } from '../../client/playwright';
@@ -98,7 +98,7 @@ async function createPersistentBrowser(config: FullConfig, clientInfo: ClientInf
throw new Error(`Browser is already in use for ${userDataDir}, use --isolated to run multiple instances of the same browser`);
const browserType = playwright[config.browser.browserName];
- const launchOptions: LaunchOptions & BrowserContextOptions = {
+ const launchOptions: playwright.LaunchOptions & playwright.BrowserContextOptions = {
tracesDir,
...config.browser.launchOptions,
...config.browser.contextOptions,
@@ -108,7 +108,7 @@ async function createPersistentBrowser(config: FullConfig, clientInfo: ClientInf
'--disable-extensions',
],
assistantMode: true,
- };
+ } as any;
try {
const browserContext = await browserType.launchPersistentContext(userDataDir, launchOptions);
return browserContext.browser()!;
diff --git a/packages/playwright-core/types/types.d.ts b/packages/playwright-core/types/types.d.ts
index ec64b02157..21d6444d37 100644
--- a/packages/playwright-core/types/types.d.ts
+++ b/packages/playwright-core/types/types.d.ts
@@ -4533,6 +4533,29 @@ export interface Page {
height: number;
}): Promise<void>;
+ /**
+ * Returns an accessibility snapshot of the page optimized for AI consumption.
+ * @param options
+ */
+ snapshotForAI(options?: {
+ /**
+ * When specified, enables incremental snapshots. Subsequent calls with the same track name will return an incremental
+ * snapshot containing only changes since the last call.
+ */
+ track?: string;
+ }): Promise<{
+ /**
+ * Full accessibility snapshot of the page.
+ */
+ full: string;
+
+ /**
+ * Incremental snapshot containing only changes since the last tracked snapshot, when using the
+ * [`track`](https://playwright.dev/docs/api/class-page#page-snapshot-for-ai-option-track) option.
+ */
+ incremental?: string;
+ }>;
+
/**
* **NOTE** Use locator-based [locator.tap([options])](https://playwright.dev/docs/api/class-locator#locator-tap) instead. Read
* more about [locators](https://playwright.dev/docs/locators).
@@ -9096,6 +9119,11 @@ export interface BrowserContext {
origin?: string;
}): Promise<void>;
+ /**
+ * Indicates that the browser context is in the process of closing or has already been closed.
+ */
+ isClosedOrClosing(): boolean;
+
/**
* **NOTE** CDP sessions are only supported on Chromium-based browsers.
*
@@ -9801,6 +9829,12 @@ export interface Browser {
*/
isConnected(): boolean;
+ /**
+ * Returns the launch options that were used to launch this browser. The return type matches the options accepted by
+ * [browserType.launch([options])](https://playwright.dev/docs/api/class-browsertype#browser-type-launch).
+ */
+ launchOptions(): Object;
+
/**
* **NOTE** CDP Sessions are only supported on Chromium-based browsers.
*
@@ -10358,6 +10392,12 @@ export interface Browser {
*/
stopTracing(): Promise<Buffer>;
+ /**
+ * Returns the user data directory that the browser was launched with, or `null` if the browser was launched without a
+ * persistent context.
+ */
+ userDataDir(): null|string;
+
/**
* Returns the browser version.
*/
@@ -14150,6 +14190,13 @@ export interface Locator {
hasText?: string|RegExp;
}): Locator;
+ /**
+ * Returns a new locator that uses best practices for referencing the matched element, prioritizing test ids, aria
+ * roles, and other user-facing attributes over CSS selectors. This is useful for converting implementation-detail
+ * selectors into more resilient, human-readable locators.
+ */
+ normalize(): Promise<Locator>;
+
/**
* Returns locator to the n-th matching element. It's zero based, `nth(0)` selects the first element.
*
@@ -21830,6 +21877,13 @@ export interface Tracing {
* @param options
*/
start(options?: {
+ /**
+ * When enabled, the trace is written to an unarchived file that is updated in real time as actions occur, instead of
+ * caching changes and archiving them into a zip file at the end. This is useful for live trace viewing during test
+ * execution.
+ */
+ live?: boolean;
+
/**
* If specified, intermediate trace files are going to be saved into the files with the given name prefix inside the
* [`tracesDir`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch-option-traces-dir) directory
diff --git a/packages/playwright/src/index.ts b/packages/playwright/src/index.ts
index 88e5147d5c..772f803866 100644
--- a/packages/playwright/src/index.ts
+++ b/packages/playwright/src/index.ts
@@ -697,7 +697,7 @@ class ArtifactsRecorder {
try {
// TODO: maybe capture snapshot when the error is created, so it's from the right page and right time
await page._wrapApiCall(async () => {
- this._pageSnapshot = (await page._snapshotForAI({ timeout: 5000 })).full;
+ this._pageSnapshot = (await page.snapshotForAI({ timeout: 5000 })).full;
}, { internal: true });
} catch {}
}
diff --git a/packages/playwright/src/mcp/test/browserBackend.ts b/packages/playwright/src/mcp/test/browserBackend.ts
index 605c75fb33..3a3f5787b7 100644
--- a/packages/playwright/src/mcp/test/browserBackend.ts
+++ b/packages/playwright/src/mcp/test/browserBackend.ts
@@ -99,7 +99,7 @@ async function generatePausedMessage(testInfo: TestInfoImpl, context: playwright
lines.push(
`- Page Snapshot:`,
'```yaml',
- (await (page as Page)._snapshotForAI()).full,
+ (await (page as Page).snapshotForAI()).full,
'```',
);
}
diff --git a/packages/playwright/src/runner/testRunner.ts b/packages/playwright/src/runner/testRunner.ts
index 05bfbdaf9b..514e1e184b 100644
--- a/packages/playwright/src/runner/testRunner.ts
+++ b/packages/playwright/src/runner/testRunner.ts
@@ -323,7 +323,7 @@ export class TestRunner extends EventEmitter<TestRunnerEventMap> {
reporter: params.reporters ? params.reporters.map(r => [r]) : undefined,
use: {
...this._configCLIOverrides.use,
- ...(params.trace === 'on' ? { trace: { mode: 'on', sources: false, _live: true } } : {}),
+ ...(params.trace === 'on' ? { trace: { mode: 'on', sources: false, live: true } } : {}),
...(params.trace === 'off' ? { trace: 'off' } : {}),
...(params.video === 'on' || params.video === 'off' ? { video: params.video } : {}),
...(params.headed !== undefined ? { headless: !params.headed } : {}),
diff --git a/packages/playwright/src/worker/testTracing.ts b/packages/playwright/src/worker/testTracing.ts
index a82cdb917a..2781187450 100644
--- a/packages/playwright/src/worker/testTracing.ts
+++ b/packages/playwright/src/worker/testTracing.ts
@@ -35,7 +35,7 @@ const version: trace.VERSION = 8;
let traceOrdinal = 0;
type TraceFixtureValue = PlaywrightWorkerOptions['trace'] | undefined;
-type TraceOptions = { screenshots: boolean, snapshots: boolean, sources: boolean, attachments: boolean, _live: boolean, mode: TraceMode };
+type TraceOptions = { screenshots: boolean, snapshots: boolean, sources: boolean, attachments: boolean, live: boolean, mode: TraceMode };
export class TestTracing {
private _testInfo: TestInfoImpl;
@@ -90,7 +90,7 @@ export class TestTracing {
}
async startIfNeeded(value: TraceFixtureValue) {
- const defaultTraceOptions: TraceOptions = { screenshots: true, snapshots: true, sources: true, attachments: true, _live: false, mode: 'off' };
+ const defaultTraceOptions: TraceOptions = { screenshots: true, snapshots: true, sources: true, attachments: true, live: false, mode: 'off' };
if (!value) {
this._options = defaultTraceOptions;
@@ -106,7 +106,7 @@ export class TestTracing {
return;
}
- if (!this._liveTraceFile && this._options._live) {
+ if (!this._liveTraceFile && this._options.live) {
// Note that trace name must start with testId for live tracing to work.
this._liveTraceFile = { file: path.join(this._tracesDir, `${this._testInfo.testId}-test.trace`), fs: new SerializedFS() };
this._liveTraceFile.fs.mkdir(path.dirname(this._liveTraceFile.file));
diff --git a/tests/page/locator-evaluate.spec.ts b/tests/page/locator-evaluate.spec.ts
index dab9cb98ea..4f8a044ea9 100644
--- a/tests/page/locator-evaluate.spec.ts
+++ b/tests/page/locator-evaluate.spec.ts
@@ -54,10 +54,3 @@ it('should not throw in case of missing selector for all', async ({ page, server
const nodesLength = await element.evaluateAll(nodes => nodes.length);
expect(nodesLength).toBe(0);
});
-
-it('should allow calling _evaluateFunction', async ({ page }) => {
- await page.setContent('<html><body><div class="tweet"><div class="like">100</div><div class="retweets">10</div></div></body></html>');
- const tweet = page.locator('.tweet .like') as any;
- const content = await tweet._evaluateFunction('node => node.innerText');
- expect(content).toBe('100');
-});
diff --git a/tests/page/page-aria-snapshot-ai.spec.ts b/tests/page/page-aria-snapshot-ai.spec.ts
index 6a7eae205a..cc1e30592b 100644
--- a/tests/page/page-aria-snapshot-ai.spec.ts
+++ b/tests/page/page-aria-snapshot-ai.spec.ts
@@ -14,14 +14,12 @@
* limitations under the License.
*/
-// @ts-ignore
-import { asLocator } from 'playwright-core/lib/utils';
import { test as it, expect } from './pageTest';
import { unshift } from '../config/utils';
async function snapshotForAI(page: any, options?: { timeout?: number, mode?: 'full' | 'incremental', track?: string }): Promise<string> {
- const snapshot = await page._snapshotForAI(options);
+ const snapshot = await page.snapshotForAI(options);
return options?.mode === 'incremental' ? snapshot.incremental : snapshot.full;
}
@@ -94,23 +92,20 @@ it('should stitch all frame snapshots', async ({ page, server }) => {
expect(href3).toBe(server.PREFIX + '/frames/frame.html');
{
- const { resolvedSelector } = await (page.locator('aria-ref=e1') as any)._resolveSelector();
- const sourceCode = asLocator('javascript', resolvedSelector);
- expect(sourceCode).toBe(`locator('body')`);
+ const resolved = await page.locator('aria-ref=e1').normalize();
+ expect(resolved.toString()).toBe(`locator('body')`);
}
{
- const { resolvedSelector } = await (page.locator('aria-ref=f4e2') as any)._resolveSelector();
- const sourceCode = asLocator('javascript', resolvedSelector);
- expect(sourceCode).toBe(`locator('iframe[name="2frames"]').contentFrame().locator('iframe[name="dos"]').contentFrame().getByText('Hi, I\\'m frame')`);
+ const resolved = await page.locator('aria-ref=f4e2').normalize();
+ expect(resolved.toString()).toBe(`locator('iframe[name="2frames"]').contentFrame().locator('iframe[name="dos"]').contentFrame().getByText('Hi, I\\'m frame')`);
}
{
// Should tolerate .describe().
- const { resolvedSelector } = await (page.locator('aria-ref=f3e2').describe('foo bar') as any)._resolveSelector();
- const sourceCode = asLocator('javascript', resolvedSelector);
- expect(sourceCode).toBe(`locator('iframe[name=\"2frames\"]').contentFrame().locator('iframe[name=\"uno\"]').contentFrame().getByText('Hi, I\\'m frame')`);
+ const resolved = await page.locator('aria-ref=f3e2').describe('foo bar').normalize();
+ expect(resolved.toString()).toBe(`locator('iframe[name=\"2frames\"]').contentFrame().locator('iframe[name=\"uno\"]').contentFrame().getByText('Hi, I\\'m frame')`);
}
{
- const error = await (page.locator('aria-ref=e1000') as any)._resolveSelector().catch(e => e);
+ const error = await page.locator('aria-ref=e1000').normalize().catch(e => e);
expect(error.message).toContain(`No element matching aria-ref=e1000`);
}
});
diff --git a/tests/page/page-evaluate.spec.ts b/tests/page/page-evaluate.spec.ts
index d4c2d0993f..b48e09bb5c 100644
--- a/tests/page/page-evaluate.spec.ts
+++ b/tests/page/page-evaluate.spec.ts
@@ -858,8 +858,3 @@ it('should ignore dangerous object keys', async ({ page }) => {
const result = await page.evaluate(arg => arg, input);
expect(result).toEqual({ safeKey: 'safeValue' });
});
-
-it('should allow calling _evaluateFunction', async ({ page }) => {
- const result = await (page as any)._evaluateFunction('() => 7 * 3');
- expect(result).toBe(21);
-});