Skip to content

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

chore(cli): remove network log, format console (#39114)

Pavel Feldman4cb14fd53d6a
diff --git a/packages/playwright/src/mcp/browser/logFile.ts b/packages/playwright/src/mcp/browser/logFile.ts
index 5fb2312af6..39134e4ab2 100644
--- a/packages/playwright/src/mcp/browser/logFile.ts
+++ b/packages/playwright/src/mcp/browser/logFile.ts
@@ -15,6 +15,7 @@
*/
import fs from 'fs';
+import path from 'path';
import { logUnhandledError } from '../log';
@@ -59,7 +60,18 @@ export class LogFile {
this._stopped = true;
}
- async take(): Promise<LogChunk | undefined> {
+ async take(relativeTo?: string): Promise<string | undefined> {
+ const logChunk = await this._take();
+ if (!logChunk)
+ return undefined;
+ const logFilePath = relativeTo ? path.relative(relativeTo, logChunk.file) : logChunk.file;
+ const lineRange = logChunk.fromLine === logChunk.toLine
+ ? `#L${logChunk.fromLine}`
+ : `#L${logChunk.fromLine}-L${logChunk.toLine}`;
+ return `${logFilePath}${lineRange}`;
+ }
+
+ private async _take(): Promise<LogChunk | undefined> {
await this._writeChain;
if (!this._file || this._entries === this._lastEntries)
return undefined;
diff --git a/packages/playwright/src/mcp/browser/response.ts b/packages/playwright/src/mcp/browser/response.ts
index b93827ea6b..19cc3e3755 100644
--- a/packages/playwright/src/mcp/browser/response.ts
+++ b/packages/playwright/src/mcp/browser/response.ts
@@ -22,7 +22,6 @@ import { renderModalStates, shouldIncludeMessage } from './tab';
import { scaleImageToFitMessage } from './tools/screenshot';
import type { TabHeader } from './tab';
-import type { LogChunk } from './logFile';
import type { CallToolResult, ImageContent, TextContent } from '@modelcontextprotocol/sdk/types.js';
import type { Context, FilenameTemplate } from './context';
@@ -186,7 +185,7 @@ export class Response {
addSection('Ran Playwright code', this._code, 'js');
// Render tab titles upon changes or when more than one tab.
- const tabSnapshot = this._context.currentTab() ? await this._context.currentTabOrDie().captureSnapshot() : undefined;
+ const tabSnapshot = this._context.currentTab() ? await this._context.currentTabOrDie().captureSnapshot(this._clientWorkspace) : undefined;
const tabHeaders = await Promise.all(this._context.tabs().map(tab => tab.headerSnapshot()));
if (this._includeSnapshot !== 'none' || tabHeaders.some(header => header.changed)) {
if (tabHeaders.length !== 1)
@@ -211,7 +210,9 @@ export class Response {
}
// Handle tab log
- const text: string[] = tabSnapshot?.logs?.map(log => renderLogChunk(log, log.type, file => this._computRelativeTo(file))).flat() ?? [];
+ const text: string[] = [];
+ if (tabSnapshot?.consoleLink)
+ text.push(`- New console entries: ${tabSnapshot.consoleLink}`);
if (tabSnapshot?.events.filter(event => event.type !== 'request').length) {
for (const event of tabSnapshot.events) {
if (event.type === 'console' && this._context.config.outputMode !== 'file') {
@@ -234,6 +235,8 @@ export function renderTabMarkdown(tab: TabHeader): string[] {
const lines = [`- Page URL: ${tab.url}`];
if (tab.title)
lines.push(`- Page Title: ${tab.title}`);
+ if (tab.console.errors || tab.console.warnings)
+ lines.push(`- Console: ${tab.console.errors} errors, ${tab.console.warnings} warnings`);
return lines;
}
@@ -250,19 +253,6 @@ export function renderTabsMarkdown(tabs: TabHeader[]): string[] {
return lines;
}
-function renderLogChunk(logChunk: LogChunk | undefined, type: string, relativeTo: (fileName: string) => string): string[] {
- if (!logChunk)
- return [];
- const lines: string[] = [];
- const logFilePath = relativeTo(logChunk.file);
- const entryWord = logChunk.entryCount === 1 ? 'entry' : 'entries';
- const lineRange = logChunk.fromLine === logChunk.toLine
- ? `#L${logChunk.fromLine}`
- : `#L${logChunk.fromLine}-L${logChunk.toLine}`;
- lines.push(`- ${logChunk.entryCount} new ${type} ${entryWord} in "${logFilePath}${lineRange}"`);
- return lines;
-}
-
function trimMiddle(text: string, maxLength: number) {
if (text.length <= maxLength)
return text;
diff --git a/packages/playwright/src/mcp/browser/tab.ts b/packages/playwright/src/mcp/browser/tab.ts
index d3799d8b6b..e1a75ae54e 100644
--- a/packages/playwright/src/mcp/browser/tab.ts
+++ b/packages/playwright/src/mcp/browser/tab.ts
@@ -24,14 +24,12 @@ import { LogFile } from './logFile';
import { ModalState } from './tools/tool';
import { handleDialog } from './tools/dialogs';
import { uploadFile } from './tools/files';
-import { isStatic, renderRequest } from './tools/network';
import { requireOrImport } from '../../transform/transform';
import type { Context } from './context';
import type { Page } from '../../../../playwright-core/src/client/page';
import type { Locator } from '../../../../playwright-core/src/client/locator';
import type { FullConfig } from './config';
-import type { LogChunk } from './logFile';
const TabEvents = {
modalState: 'modalState'
@@ -78,6 +76,7 @@ export type TabHeader = {
title: string;
url: string;
current: boolean;
+ console: { total: number, warnings: number, errors: number };
};
type TabSnapshot = {
@@ -85,13 +84,13 @@ type TabSnapshot = {
ariaSnapshotDiff?: string;
modalStates: ModalState[];
events: EventEntry[];
- logs?: LogChunk[];
+ consoleLink?: string;
};
export class Tab extends EventEmitter<TabEventsInterface> {
readonly context: Context;
readonly page: Page;
- private _lastHeader: TabHeader = { title: 'about:blank', url: 'about:blank', current: false };
+ private _lastHeader: TabHeader = { title: 'about:blank', url: 'about:blank', current: false, console: { total: 0, warnings: 0, errors: 0 } };
private _consoleMessages: ConsoleMessage[] = [];
private _downloads: Download[] = [];
private _requests: playwright.Request[] = [];
@@ -100,8 +99,7 @@ export class Tab extends EventEmitter<TabEventsInterface> {
private _initializedPromise: Promise<void>;
private _needsFullSnapshot = false;
private _recentEventEntries: EventEntry[] = [];
-
- private _logs!: Record<'console-error' | 'console-warning' | 'console-info' | 'console-debug' | 'network-full' | 'network-dynamic', LogFile>;
+ private _consoleLog: LogFile;
constructor(context: Context, page: playwright.Page, onPageClose: (tab: Tab) => void) {
super();
@@ -129,7 +127,8 @@ export class Tab extends EventEmitter<TabEventsInterface> {
page.setDefaultNavigationTimeout(this.context.config.timeouts.navigation);
page.setDefaultTimeout(this.context.config.timeouts.action);
(page as any)[tabSymbol] = this;
- this._resetLogs();
+ const wallTime = Date.now();
+ this._consoleLog = new LogFile(this.context, wallTime, 'console', 'Console');
this._initializedPromise = this._initialize();
}
@@ -211,16 +210,8 @@ export class Tab extends EventEmitter<TabEventsInterface> {
private _resetLogs() {
const wallTime = Date.now();
- for (const log of Object.values(this._logs ?? {}))
- log.stop();
- this._logs = {
- 'console-error': new LogFile(this.context, wallTime, 'console-error', 'Console'),
- 'console-warning': new LogFile(this.context, wallTime, 'console-warning', 'Console'),
- 'console-info': new LogFile(this.context, wallTime, 'console-info', 'Console'),
- 'console-debug': new LogFile(this.context, wallTime, 'console-debug', 'Console'),
- 'network-full': new LogFile(this.context, wallTime, 'network-full', 'Network'),
- 'network-dynamic': new LogFile(this.context, wallTime, 'network-dynamic', 'Network'),
- };
+ this._consoleLog.stop();
+ this._consoleLog = new LogFile(this.context, wallTime, 'console', 'Console');
}
private _handleRequest(request: playwright.Request) {
@@ -229,20 +220,12 @@ export class Tab extends EventEmitter<TabEventsInterface> {
// response is received, so we use Date.now() as a fallback.
const wallTime = request.timing().startTime || Date.now();
this._addLogEntry({ type: 'request', wallTime, request });
- const render = async () => await renderRequest(request);
- this._logs['network-full'].appendLine(wallTime, render);
- if (!isStatic(request))
- this._logs['network-dynamic'].appendLine(wallTime, render);
}
private _handleResponse(response: playwright.Response) {
const timing = response.request().timing();
const wallTime = timing.responseStart + timing.startTime;
this._addLogEntry({ type: 'request', wallTime, request: response.request() });
- const render = async () => await renderRequest(response.request());
- this._logs['network-full'].appendLine(wallTime, render);
- if (!isStatic(response.request()) || response.status() >= 400)
- this._logs['network-dynamic'].appendLine(wallTime, render);
}
private _handleRequestFailed(request: playwright.Request) {
@@ -250,9 +233,6 @@ export class Tab extends EventEmitter<TabEventsInterface> {
const timing = request.timing();
const wallTime = timing.responseEnd + timing.startTime;
this._addLogEntry({ type: 'request', wallTime, request });
- const render = async () => await renderRequest(request);
- this._logs['network-full'].appendLine(wallTime, render);
- this._logs['network-dynamic'].appendLine(wallTime, render);
}
private _handleConsoleMessage(message: ConsoleMessage) {
@@ -260,7 +240,8 @@ export class Tab extends EventEmitter<TabEventsInterface> {
const wallTime = Date.now();
this._addLogEntry({ type: 'console', wallTime, message });
const level = consoleLevelForMessageType(message.type);
- this._logs[`console-${level}`].appendLine(wallTime, () => message.toString());
+ if (level === 'error' || level === 'warning')
+ this._consoleLog.appendLine(wallTime, () => message.toString());
}
private _addLogEntry(entry: EventEntry) {
@@ -277,14 +258,20 @@ export class Tab extends EventEmitter<TabEventsInterface> {
await this._raceAgainstModalStates(async () => {
title = await callOnPageNoTrace(this.page, page => page.title());
});
- if (this._lastHeader.title !== title || this._lastHeader.url !== this.page.url() || this._lastHeader.current !== this.isCurrentTab()) {
- this._lastHeader = { title: title ?? '', url: this.page.url(), current: this.isCurrentTab() };
+ const newHeader: TabHeader = {
+ title: title ?? '',
+ url: this.page.url(),
+ current: this.isCurrentTab(),
+ console: await this.consoleMessageCount()
+ };
+
+ if (!tabHeaderEquals(this._lastHeader, newHeader)) {
+ this._lastHeader = newHeader;
return { ...this._lastHeader, changed: true };
}
return { ...this._lastHeader, changed: false };
}
-
isCurrentTab(): boolean {
return this === this.context.currentTab();
}
@@ -322,6 +309,19 @@ export class Tab extends EventEmitter<TabEventsInterface> {
await this.waitForLoadState('load', { timeout: 5000 });
}
+ async consoleMessageCount(): Promise<{ total: number, errors: number, warnings: number }> {
+ await this._initializedPromise;
+ let errors = 0;
+ let warnings = 0;
+ for (const message of this._consoleMessages) {
+ if (message.type === 'error')
+ errors++;
+ else if (message.type === 'warning')
+ warnings++;
+ }
+ return { total: this._consoleMessages.length, errors, warnings };
+ }
+
async consoleMessages(level: ConsoleMessageLevel): Promise<ConsoleMessage[]> {
await this._initializedPromise;
return this._consoleMessages.filter(message => shouldIncludeMessage(level, message.type));
@@ -342,7 +342,7 @@ export class Tab extends EventEmitter<TabEventsInterface> {
this._requests.length = 0;
}
- async captureSnapshot(): Promise<TabSnapshot> {
+ async captureSnapshot(relativeTo: string | undefined): Promise<TabSnapshot> {
await this._initializedPromise;
let tabSnapshot: TabSnapshot | undefined;
const modalStates = await this._raceAgainstModalStates(async () => {
@@ -351,11 +351,11 @@ export class Tab extends EventEmitter<TabEventsInterface> {
ariaSnapshot: snapshot.full,
ariaSnapshotDiff: this._needsFullSnapshot ? undefined : snapshot.incremental,
modalStates: [],
- events: []
+ events: [],
};
});
if (tabSnapshot) {
- tabSnapshot.logs = (await Promise.all(Object.values(this._logs).map(log => log.take()))).filter(l => !!l);
+ tabSnapshot.consoleLink = await this._consoleLog.take(relativeTo);
tabSnapshot.events = this._recentEventEntries;
this._recentEventEntries = [];
}
@@ -515,3 +515,12 @@ function sanitizeForFilePath(s: string) {
return sanitize(s);
return sanitize(s.substring(0, separator)) + '.' + sanitize(s.substring(separator + 1));
}
+
+function tabHeaderEquals(a: TabHeader, b: TabHeader): boolean {
+ return a.title === b.title &&
+ a.url === b.url &&
+ a.current === b.current &&
+ a.console.errors === b.console.errors &&
+ a.console.warnings === b.console.warnings &&
+ a.console.total === b.console.total;
+}
diff --git a/packages/playwright/src/mcp/browser/tools/console.ts b/packages/playwright/src/mcp/browser/tools/console.ts
index e5e121978c..86623e1b1a 100644
--- a/packages/playwright/src/mcp/browser/tools/console.ts
+++ b/packages/playwright/src/mcp/browser/tools/console.ts
@@ -30,8 +30,12 @@ const console = defineTabTool({
type: 'readOnly',
},
handle: async (tab, params, response) => {
+ const count = await tab.consoleMessageCount();
+ const header = [`Total messages: ${count.total} (Errors: ${count.errors}, Warnings: ${count.warnings})`];
const messages = await tab.consoleMessages(params.level);
- const text = messages.map(message => message.toString()).join('\n');
+ if (messages.length !== count.total)
+ header.push(`Returning ${messages.length} messages for level "${params.level}"`);
+ const text = [...header, '', ...messages.map(message => message.toString())].join('\n');
await response.addResult('Console', text, { prefix: 'console', ext: 'log', suggestedFilename: params.filename });
},
});
diff --git a/packages/playwright/src/mcp/browser/tools/network.ts b/packages/playwright/src/mcp/browser/tools/network.ts
index c1c1c80bdd..11bec55bc4 100644
--- a/packages/playwright/src/mcp/browser/tools/network.ts
+++ b/packages/playwright/src/mcp/browser/tools/network.ts
@@ -37,7 +37,7 @@ const requests = defineTabTool({
const requests = await tab.requests();
const text: string[] = [];
for (const request of requests) {
- if (!params.includeStatic && isStatic(request) && isSuccessfulResponse(request))
+ if (!params.includeStatic && !isFetch(request) && isSuccessfulResponse(request))
continue;
text.push(await renderRequest(request));
}
@@ -67,8 +67,8 @@ function isSuccessfulResponse(request: playwright.Request): boolean {
return !!response && response.status() < 400;
}
-export function isStatic(request: playwright.Request): boolean {
- return ['document', 'stylesheet', 'image', 'media', 'font', 'script', 'manifest'].includes(request.resourceType());
+export function isFetch(request: playwright.Request): boolean {
+ return ['fetch', 'xhr'].includes(request.resourceType());
}
export async function renderRequest(request: playwright.Request): Promise<string> {
diff --git a/tests/mcp/cli-devtools.spec.ts b/tests/mcp/cli-devtools.spec.ts
index 7843422a5e..ab9703651e 100644
--- a/tests/mcp/cli-devtools.spec.ts
+++ b/tests/mcp/cli-devtools.spec.ts
@@ -21,6 +21,7 @@ test('console', async ({ cli, server }) => {
await cli('eval', 'console.log("Hello, world!")');
const { attachments } = await cli('console');
expect(attachments[0].name).toEqual('Console');
+ expect(attachments[0].data.toString()).toContain('Total messages: 1 (Errors: 0, Warnings: 0)');
expect(attachments[0].data.toString()).toContain('Hello, world!');
});
@@ -30,6 +31,8 @@ test('console error', async ({ cli, server }) => {
await cli('eval', 'console.error("error-level")');
const { attachments } = await cli('console', 'error');
expect(attachments[0].name).toEqual('Console');
+ expect(attachments[0].data.toString()).toContain('Total messages: 2 (Errors: 1, Warnings: 0)');
+ expect(attachments[0].data.toString()).toContain('Returning 1 messages for level "error"');
expect(attachments[0].data.toString()).not.toContain('log-level');
expect(attachments[0].data.toString()).toContain('error-level');
});
diff --git a/tests/mcp/console.spec.ts b/tests/mcp/console.spec.ts
index f0d27d4129..7060ebb004 100644
--- a/tests/mcp/console.spec.ts
+++ b/tests/mcp/console.spec.ts
@@ -40,8 +40,13 @@ test('browser_console_messages', async ({ client, server }) => {
name: 'browser_console_messages',
});
expect(resource).toHaveResponse({
- result: `[LOG] Hello, world! @ ${server.PREFIX}/:4
-[ERROR] Error @ ${server.PREFIX}/:5`,
+ result: expect.stringContaining('Total messages: 2 (Errors: 1, Warnings: 0)'),
+ });
+ expect(resource).toHaveResponse({
+ result: expect.stringContaining(`[LOG] Hello, world! @ ${server.PREFIX}/:4`),
+ });
+ expect(resource).toHaveResponse({
+ result: expect.stringContaining(`[ERROR] Error @ ${server.PREFIX}/:5`),
});
});
@@ -188,6 +193,8 @@ test('browser_console_messages errors only', async ({ client, server }) => {
level: 'error',
},
}));
+ expect.soft(response.result).toMatch(/Total messages: \d+ \(Errors: \d+, Warnings: \d+\)/);
+ expect.soft(response.result).toMatch(/Returning \d+ messages for level "error"/);
expect.soft(response.result).toContain('console.error');
expect.soft(response.result).toContain('Error: unhandled');
expect.soft(response.result).toContain('404');
@@ -205,7 +212,7 @@ test('console log file is created on snapshot', async ({ startClient, server },
<!DOCTYPE html>
<html>
<script>
- console.log("Hello from console");
+ console.warn("Warning message");
console.error("Error message1");
console.error("Error message2");
</script>
@@ -218,27 +225,17 @@ test('console log file is created on snapshot', async ({ startClient, server },
}));
// Check events section mentions the log file with line range
- expect(response.events).toMatch(/1 new console entry in "output\/console-info.+\.log#L\d+(-L\d+)?"/);
- expect(response.events).toMatch(/2 new console entries in "output\/console-error.+\.log#L\d+(-L\d+)?"/);
+ expect(response.events).toMatch(/New console entries: output\/console-.+\.log#L\d+(-L\d+)?/);
- // Verify log files exist and contain the messages
+ // Verify log file exists and contains the messages
const files = await fs.promises.readdir(outputDir);
const logFiles = files.filter(f => f.startsWith('console-') && f.endsWith('.log'));
- expect(logFiles.length).toBe(2);
-
- async function readLog(level: string) {
- const file = logFiles.find(f => f.startsWith(`console-${level}-`));
- if (!file)
- return '<no log file>';
- return fs.promises.readFile(path.join(outputDir, file), 'utf-8');
- }
-
- const infoLog = await readLog('info');
- expect(infoLog).toContain('Hello from console');
+ expect(logFiles.length).toBe(1);
- const errorLog = await readLog('error');
- expect(errorLog).toContain('Error message1');
- expect(errorLog).toContain('Error message2');
+ const logContent = await fs.promises.readFile(path.join(outputDir, logFiles[0]), 'utf-8');
+ expect(logContent).toContain('Warning message');
+ expect(logContent).toContain('Error message1');
+ expect(logContent).toContain('Error message2');
});
test('console log file shows correct entry count', async ({ startClient, server }, testInfo) => {
@@ -251,9 +248,9 @@ test('console log file shows correct entry count', async ({ startClient, server
<!DOCTYPE html>
<html>
<script>
- console.log("Message 1");
- console.log("Message 2");
- console.log("Message 3");
+ console.error("Error 1");
+ console.error("Error 2");
+ console.error("Error 3");
</script>
</html>
`, 'text/html');
@@ -263,7 +260,7 @@ test('console log file shows correct entry count', async ({ startClient, server
arguments: { url: server.PREFIX },
}));
- expect(response.events).toContain('3 new console entries');
+ expect(response.events).toContain('New console entries:');
});
test('console log file shows singular entry', async ({ startClient, server }, testInfo) => {
@@ -276,7 +273,7 @@ test('console log file shows singular entry', async ({ startClient, server }, te
<!DOCTYPE html>
<html>
<script>
- console.log("Single message");
+ console.error("Single error");
</script>
</html>
`, 'text/html');
@@ -286,7 +283,7 @@ test('console log file shows singular entry', async ({ startClient, server }, te
arguments: { url: server.PREFIX },
}));
- expect(response.events).toContain('1 new console entry');
+ expect(response.events).toContain('New console entries:');
});
test('new console log file after navigation', async ({ startClient, server }, testInfo) => {
@@ -298,14 +295,14 @@ test('new console log file after navigation', async ({ startClient, server }, te
server.setContent('/page1', `
<!DOCTYPE html>
<html>
- <script>console.log("Page 1 message");</script>
+ <script>console.error("Page 1 message");</script>
</html>
`, 'text/html');
server.setContent('/page2', `
<!DOCTYPE html>
<html>
- <script>console.log("Page 2 message");</script>
+ <script>console.error("Page 2 message");</script>
</html>
`, 'text/html');
@@ -344,7 +341,7 @@ test('console log file appends on multiple snapshots', async ({ startClient, ser
server.setContent('/', `
<!DOCTYPE html>
<html>
- <button onclick="console.log('Button clicked');">Click me</button>
+ <button onclick="console.error('Button clicked');">Click me</button>
</html>
`, 'text/html');
@@ -386,11 +383,8 @@ test('console log file stores message type and content', async ({ startClient, s
<!DOCTYPE html>
<html>
<script>
- console.log("Log message");
console.warn("Warning message");
console.error("Error message");
- console.info("Info message");
- console.debug("Debug message");
</script>
</html>
`, 'text/html');
@@ -402,34 +396,14 @@ test('console log file stores message type and content', async ({ startClient, s
const files = await fs.promises.readdir(outputDir);
const logFiles = files.filter(f => f.startsWith('console-') && f.endsWith('.log'));
- expect(logFiles.length).toBe(4);
-
- async function readLog(level: string) {
- const file = logFiles.find(f => f.startsWith(`console-${level}-`));
- if (!file)
- return '<no log file>';
- return fs.promises.readFile(path.join(outputDir, file), 'utf-8');
- }
-
- // Check that message types are stored
- const infoContent = await readLog('info');
- expect(infoContent).toContain('[LOG] Log message');
- expect(infoContent).toContain('[INFO] Info message');
-
- const warningContent = await readLog('warning');
- expect(warningContent).toContain('[WARNING] Warning message');
-
- const errorContent = await readLog('error');
- expect(errorContent).toContain('[ERROR] Error message');
+ expect(logFiles.length).toBe(1);
- const debugContent = await readLog('debug');
- expect(debugContent).toContain('[DEBUG] Debug message');
+ const logContent = await fs.promises.readFile(path.join(outputDir, logFiles[0]), 'utf-8');
+ expect(logContent).toContain('[WARNING] Warning message');
+ expect(logContent).toContain('[ERROR] Error message');
// Check that source location is stored
- expect(infoContent).toMatch(/@ http:\/\/localhost:\d+\/:\d/); // console.log line
- expect(warningContent).toMatch(/@ http:\/\/localhost:\d+\/:\d/); // console.warn line
- expect(errorContent).toMatch(/@ http:\/\/localhost:\d+\/:\d/); // console.error line
- expect(debugContent).toMatch(/@ http:\/\/localhost:\d+\/:\d/); // console.debug line
+ expect(logContent).toMatch(/@ http:\/\/localhost:\d+\/:\d/);
});
test('console log is updated without taking snapshots', async ({ startClient, server }, testInfo) => {
@@ -458,7 +432,7 @@ test('console log is updated without taking snapshots', async ({ startClient, se
arguments: {
function: `() => {
for (let i = 0; i < 5; i++) {
- console.log('Evaluated message ' + i);
+ console.error('Evaluated message ' + i);
}
}`,
},
diff --git a/tests/mcp/network.spec.ts b/tests/mcp/network.spec.ts
index 4bd7d3b12a..9bfdbe337b 100644
--- a/tests/mcp/network.spec.ts
+++ b/tests/mcp/network.spec.ts
@@ -14,19 +14,8 @@
* limitations under the License.
*/
-import fs from 'fs/promises';
-
import { test, expect, parseResponse } from './fixtures';
-function parseLogEvents(events: string) {
- const dynamicMatch = /\d+ new network entr(y|ies) in "(output[\\/]network-dynamic-.+\.log)#L\d+(-L\d+)?"/.exec(events);
- const fullMatch = /\d+ new network entr(y|ies) in "(output[\\/]network-full-.+\.log)#L\d+(-L\d+)?"/.exec(events);
- return {
- dynamicLogFile: dynamicMatch?.[2],
- fullLogFile: fullMatch?.[2],
- };
-}
-
test('browser_network_requests', async ({ client, server }) => {
server.setContent('/', `
<button onclick="fetch('/json')">Click me</button>
@@ -71,201 +60,3 @@ test('browser_network_requests', async ({ client, server }) => {
expect(response.result).toContain(`[GET] ${`${server.PREFIX}/image.png`} => [404]`);
}
});
-
-test('network log file is returned on snapshot', async ({ startClient, server }, testInfo) => {
- const outputDir = testInfo.outputPath('output');
- const { client } = await startClient({
- config: { outputDir, outputMode: 'file' },
- });
-
- server.setContent('/empty.html', `
- <html>
- <head>
- <link rel="stylesheet" href="/one-style.css">
- </head>
- <body>
- <img src="/image.png" />
- <script src="/script.js"></script>
- </body>
- </html>
- `, 'text/html');
-
- const response = parseResponse(await client.callTool({
- name: 'browser_navigate',
- arguments: { url: server.EMPTY_PAGE },
- }));
-
- expect(response.events).toMatch(/\d+ new network entr(y|ies) in "output\/network-full-.+\.log#L\d+(-L\d+)?"/);
-
- // Verify network log file exist
- const files = await fs.readdir(outputDir);
- const networkLogFiles = files.filter(f => f.startsWith('network-full-') && f.endsWith('.log'));
- expect(networkLogFiles.length).toBe(1);
-
- const { fullLogFile } = parseLogEvents(response.events);
- expect(fullLogFile).toBeTruthy();
- // Verify the log contains both requests
- const logContent = await fs.readFile(testInfo.outputPath(fullLogFile), 'utf-8');
- expect(logContent).toMatch(new RegExp([
- /\[GET\].*empty\.html => \[200\] OK/,
- /\/image\.png => \[404\] Not Found/,
- /\/one-style\.css => \[200\] OK/,
- /\/script\.js => \[404\] Not Found/,
- ].map(r => `(?=[\\s\\S]*${r.source})`).join(''))
- );
-});
-
-test('network log file separates requests and assets', async ({ startClient, server }, testInfo) => {
- const outputDir = testInfo.outputPath('output');
- const { client } = await startClient({
- config: { outputDir, outputMode: 'file' },
- });
-
- server.setContent('/empty.html', `
- <html>
- <body>
- <img src="/image.png" />
- </body>
- </html>
- `, 'text/html');
-
- server.setContent('/api/data', JSON.stringify({ data: 'test' }), 'application/json');
-
- await client.callTool({
- name: 'browser_navigate',
- arguments: { url: server.EMPTY_PAGE },
- });
-
- const response = parseResponse(await client.callTool({
- name: 'browser_evaluate',
- arguments: { function: '() => fetch("/api/data")' },
- }));
- expect(response.events).toMatch(/\d+ new network entr(y|ies) in "output\/network-dynamic-.+\.log#L\d+(-L\d+)?"/);
-
- // Check that both network-dynamic and network-full log files exist
- const { dynamicLogFile, fullLogFile } = parseLogEvents(response.events);
- expect(dynamicLogFile).toBeTruthy();
- expect(fullLogFile).toBeTruthy();
-
- // API request should be in network-dynamic log
- const dynamicContent = await fs.readFile(testInfo.outputPath(dynamicLogFile), 'utf-8');
- expect(dynamicContent).toMatch(new RegExp([
- /\/api\/data => \[200\] OK/,
- /\/image\.png => \[404\] Not Found/,
- ].map(r => `(?=[\\s\\S]*${r.source})`).join('')));
- // main resource
- expect(dynamicContent).not.toContain(`[GET] ${server.EMPTY_PAGE}`);
-
- // network-full should contain all requests
- const fullContent = await fs.readFile(testInfo.outputPath(fullLogFile), 'utf-8');
- expect(fullContent).toMatch(new RegExp([
- /\[GET\].*empty\.html => \[200\] OK/,
- /\/image\.png => \[404\] Not Found/,
- /\/api\/data => \[200\] OK/,
- ].map(r => `(?=[\\s\\S]*${r.source})`).join('')));
-});
-
-test('network log file stores method and status', async ({ startClient, server }, testInfo) => {
- const outputDir = testInfo.outputPath('output');
- const { client } = await startClient({
- config: { outputDir, outputMode: 'file' },
- });
-
- server.setContent('/api/get', JSON.stringify({ method: 'get' }), 'application/json');
- server.setContent('/api/post', JSON.stringify({ method: 'post' }), 'application/json');
-
- await client.callTool({
- name: 'browser_navigate',
- arguments: { url: server.EMPTY_PAGE },
- });
-
- const response = parseResponse(await client.callTool({
- name: 'browser_evaluate',
- arguments: { function: `async () => {
- await fetch('/api/get');
- await fetch('/api/post', { method: 'POST' });
- }`
- },
- }));
- expect(response.events).toMatch(/\d+ new network entr(y|ies) in "output\/network-dynamic-.+\.log#L\d+(-L\d+)?"/);
-
- const { dynamicLogFile, fullLogFile } = parseLogEvents(response.events);
- expect(dynamicLogFile).toBeTruthy();
- expect(fullLogFile).toBeTruthy();
-
- const logContent = await fs.readFile(testInfo.outputPath(dynamicLogFile), 'utf-8');
- expect(logContent).toMatch(new RegExp([
- /\[GET\].*\/api\/get.*=>\s*\[200\]/,
- /\[POST\].*\/api\/post.*=>\s*\[200\]/,
- ].map(r => `(?=[\\s\\S]*${r.source})`).join('')));
-
- const fullContent = await fs.readFile(testInfo.outputPath(fullLogFile), 'utf-8');
- expect(fullContent).toMatch(new RegExp([
- /\[GET\].*\/api\/get.*=>\s*\[200\]/,
- /\[POST\].*\/api\/post.*=>\s*\[200\]/,
- ].map(r => `(?=[\\s\\S]*${r.source})`).join('')));
-});
-
-test('new network log file after navigation', async ({ startClient, server }, testInfo) => {
- const outputDir = testInfo.outputPath('output');
- const { client } = await startClient({
- config: { outputDir, outputMode: 'file' },
- });
-
- server.setContent('/page1', `
- <html>
- <head>
- <link rel="stylesheet" href="/one-style.css">
- </head>
- </html>
- `, 'text/html');
-
- server.setContent('/page2', `
- <html>
- <head>
- <link rel="stylesheet" href="/one-style.css">
- </head>
- <body>
- <img src="/image.png" />
- </body>
- </html>
- `, 'text/html');
-
- // Navigate to first page
- const response1 = parseResponse(await client.callTool({
- name: 'browser_navigate',
- arguments: { url: server.PREFIX + '/page1' },
- }));
-
- {
- // Should have one network-full log file
- const { fullLogFile } = parseLogEvents(response1.events);
- expect(fullLogFile).toBeTruthy();
-
- const logContent = await fs.readFile(testInfo.outputPath(fullLogFile), 'utf-8');
- expect(logContent).toContain('/one-style.css');
- }
-
- // Navigate to second page
- const response2 = parseResponse(await client.callTool({
- name: 'browser_navigate',
- arguments: { url: server.PREFIX + '/page2' },
- }));
-
- expect(response2.events).toMatch(/\d+ new network entries in "output\/network-full-.+\.log#L\d+(-L\d+)?"/);
- const { fullLogFile: secondLogFile } = parseLogEvents(response2.events);
-
- {
- // Should have 2 network-full log files (one per navigation)
- const files = await fs.readdir(outputDir);
- const networkLogs = files.filter(f => f.startsWith('network-full-') && f.endsWith('.log'));
- expect(networkLogs.length).toBe(2);
-
- expect(secondLogFile).toBeTruthy();
- const logContent = await fs.readFile(testInfo.outputPath(secondLogFile), 'utf-8');
- expect(logContent).toMatch(new RegExp([
- /\/one-style\.css => \[200\] OK/,
- /\/image\.png => \[404\] Not Found/,
- ].map(r => `(?=[\\s\\S]*${r.source})`).join('')));
- }
-});
diff --git a/tests/mcp/session-log.spec.ts b/tests/mcp/session-log.spec.ts
index b854d59bf8..70b6c89694 100644
--- a/tests/mcp/session-log.spec.ts
+++ b/tests/mcp/session-log.spec.ts
@@ -61,8 +61,7 @@ test('session log should record tool calls', async ({ startClient, server, mcpBr
\\{
"code": "await page.goto\\('http://localhost:${server.PORT}'\\);",
"page": "- Page URL: http://localhost:${server.PORT}/\\\\n- Page Title: Title",
- "snapshot": "\\\`\\\`\\\`yaml\\\\n- button \\\\"Submit\\\\" \\[ref=e2\\]\\\\n\\\`\\\`\\\`",
- "events": "- \\d+ new network entr(?:y|ies) in \\\\"output/network-full-.+\\.log#L\\d+(?:-L\\d+)?\\\\""
+ "snapshot": "\\\`\\\`\\\`yaml\\\\n- button \\\\"Submit\\\\" \\[ref=e2\\]\\\\n\\\`\\\`\\\`"
\\}
\\\`\\\`\\\`