Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/playwright-core/src/cli/program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,7 @@ async function openPage(context: BrowserContext, url: string | undefined): Promi

async function open(options: Options, url: string | undefined) {
const { context } = await launchContext(options, { headless: !!process.env.PWTEST_CLI_HEADLESS, executablePath: process.env.PWTEST_CLI_EXECUTABLE_PATH });
await context._exposeConsoleApi();
await openPage(context, url);
}

Expand Down
4 changes: 4 additions & 0 deletions packages/playwright-core/src/client/browserContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,10 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
await this._channel.disableRecorder();
}

async _exposeConsoleApi() {
await this._channel.exposeConsoleApi();
}

_setAllowedProtocols(protocols: string[]) {
this._allowedProtocols = protocols;
}
Expand Down
2 changes: 2 additions & 0 deletions packages/playwright-core/src/protocol/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,8 @@ scheme.BrowserContextEnableRecorderParams = tObject({
scheme.BrowserContextEnableRecorderResult = tOptional(tObject({}));
scheme.BrowserContextDisableRecorderParams = tOptional(tObject({}));
scheme.BrowserContextDisableRecorderResult = tOptional(tObject({}));
scheme.BrowserContextExposeConsoleApiParams = tOptional(tObject({}));
scheme.BrowserContextExposeConsoleApiResult = tOptional(tObject({}));
scheme.BrowserContextNewCDPSessionParams = tObject({
page: tOptional(tChannel(['Page'])),
frame: tOptional(tChannel(['Frame'])),
Expand Down
20 changes: 14 additions & 6 deletions packages/playwright-core/src/server/browserContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ export abstract class BrowserContext<EM extends EventMap = EventMap> extends Sdk
_clientCertificatesProxy: ClientCertificatesProxy | undefined;
private _playwrightBindingExposed?: Promise<void>;
readonly dialogManager: DialogManager;
private _consoleApiExposed = false;

constructor(browser: Browser, options: types.BrowserContextOptions, browserContextId: string | undefined) {
super(browser, 'browser-context');
Expand Down Expand Up @@ -159,12 +160,9 @@ export abstract class BrowserContext<EM extends EventMap = EventMap> extends Sdk
RecorderApp.showInspectorNoReply(this);
});

if (debugMode() === 'console') {
await this.extendInjectedScript(`
function installConsoleApi(injectedScript) { injectedScript.consoleApi.install(); }
module.exports = { default: () => installConsoleApi };
`);
}
if (debugMode() === 'console')
await this.exposeConsoleApi();

if (this._options.serviceWorkers === 'block')
await this.addInitScript(undefined, `\nif (navigator.serviceWorker) navigator.serviceWorker.register = async () => { console.warn('Service Worker registration blocked by Playwright'); };\n`);

Expand All @@ -176,6 +174,16 @@ export abstract class BrowserContext<EM extends EventMap = EventMap> extends Sdk
return this._debugger;
}

async exposeConsoleApi() {
if (this._consoleApiExposed)
return;
this._consoleApiExposed = true;
await this.extendInjectedScript(`
function installConsoleApi(injectedScript) { injectedScript.consoleApi.install(); }
module.exports = { default: () => installConsoleApi };
`);
}

async _ensureVideosPath() {
if (this._options.recordVideo)
await mkdirIfNeeded(path.join(this._options.recordVideo.dir, 'dummy'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,10 @@ export class BrowserContextDispatcher extends Dispatcher<BrowserContext, channel
recorder.setMode('none');
}

async exposeConsoleApi(params: channels.BrowserContextExposeConsoleApiParams, progress: Progress): Promise<void> {
await this._context.exposeConsoleApi();
}

async pause(params: channels.BrowserContextPauseParams, progress: Progress) {
// Debugger will take care of this.
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export const methodMetainfo = new Map<string, { internal?: boolean, title?: stri
['BrowserContext.pause', { title: 'Pause', }],
['BrowserContext.enableRecorder', { internal: true, }],
['BrowserContext.disableRecorder', { internal: true, }],
['BrowserContext.exposeConsoleApi', { internal: true, }],
['BrowserContext.newCDPSession', { title: 'Create CDP session', group: 'configuration', }],
['BrowserContext.harStart', { internal: true, }],
['BrowserContext.harExport', { internal: true, }],
Expand Down
4 changes: 4 additions & 0 deletions packages/protocol/src/channels.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1674,6 +1674,7 @@ export interface BrowserContextChannel extends BrowserContextEventTarget, EventT
pause(params?: BrowserContextPauseParams, progress?: Progress): Promise<BrowserContextPauseResult>;
enableRecorder(params: BrowserContextEnableRecorderParams, progress?: Progress): Promise<BrowserContextEnableRecorderResult>;
disableRecorder(params?: BrowserContextDisableRecorderParams, progress?: Progress): Promise<BrowserContextDisableRecorderResult>;
exposeConsoleApi(params?: BrowserContextExposeConsoleApiParams, progress?: Progress): Promise<BrowserContextExposeConsoleApiResult>;
newCDPSession(params: BrowserContextNewCDPSessionParams, progress?: Progress): Promise<BrowserContextNewCDPSessionResult>;
harStart(params: BrowserContextHarStartParams, progress?: Progress): Promise<BrowserContextHarStartResult>;
harExport(params: BrowserContextHarExportParams, progress?: Progress): Promise<BrowserContextHarExportResult>;
Expand Down Expand Up @@ -1953,6 +1954,9 @@ export type BrowserContextEnableRecorderResult = void;
export type BrowserContextDisableRecorderParams = {};
export type BrowserContextDisableRecorderOptions = {};
export type BrowserContextDisableRecorderResult = void;
export type BrowserContextExposeConsoleApiParams = {};
export type BrowserContextExposeConsoleApiOptions = {};
export type BrowserContextExposeConsoleApiResult = void;
export type BrowserContextNewCDPSessionParams = {
page?: PageChannel,
frame?: FrameChannel,
Expand Down
3 changes: 3 additions & 0 deletions packages/protocol/src/protocol.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1353,6 +1353,9 @@ BrowserContext:
disableRecorder:
internal: true

exposeConsoleApi:
internal: true

newCDPSession:
title: Create CDP session
group: configuration
Expand Down
Loading