Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
test: add logs to mcp tests (#38613)
Pavel Feldman326286621c0d
diff --git a/.github/workflows/tests_mcp.yml b/.github/workflows/tests_mcp.ymlindex e6c8ed978c..d068bf9faa 100644--- a/.github/workflows/tests_mcp.yml+++ b/.github/workflows/tests_mcp.yml@@ -23,6 +23,8 @@ env:# Force terminal colors. @see https://www.npmjs.com/package/colorsFORCE_COLOR: 1ELECTRON_SKIP_BINARY_DOWNLOAD: 1+ PWDEBUGIMPL=1+ DEBUG: pw:mcp:errorjobs:test_mcp:diff --git a/packages/playwright/src/mcp/browser/tab.ts b/packages/playwright/src/mcp/browser/tab.tsindex 9563bf7d29..98dca4165a 100644--- a/packages/playwright/src/mcp/browser/tab.ts+++ b/packages/playwright/src/mcp/browser/tab.ts@@ -18,7 +18,7 @@ import { EventEmitter } from 'events';import * as playwright from 'playwright-core';import { asLocator, ManualPromise } from 'playwright-core/lib/utils';-import { callOnPageNoTrace, waitForCompletion } from './tools/utils';+import { callOnPageNoTrace, waitForCompletion, eventWaiter } from './tools/utils';import { logUnhandledError } from '../log';import { ModalState } from './tools/tool';import { handleDialog } from './tools/dialogs';@@ -191,9 +191,10 @@ export class Tab extends EventEmitter<TabEventsInterface> {await this._initializedPromise;this._clearCollectedArtifacts();- const downloadEvent = callOnPageNoTrace(this.page, page => page.waitForEvent('download').catch(logUnhandledError));+ const { promise: downloadEvent, abort: abortDownloadEvent } = eventWaiter<playwright.Download>(this.page, 'download', 3000);try {await this.page.goto(url, { waitUntil: 'domcontentloaded' });+ abortDownloadEvent();} catch (_e: unknown) {const e = _e as Error;const mightBeDownload =@@ -202,10 +203,7 @@ export class Tab extends EventEmitter<TabEventsInterface> {if (!mightBeDownload)throw e;// on chromium, the download event is fired *after* page.goto rejects, so we wait a lil bit- const download = await Promise.race([- downloadEvent,- new Promise(resolve => setTimeout(resolve, 3000)),- ]);+ const download = await downloadEvent;if (!download)throw e;// Make sure other "download" listeners are notified first.diff --git a/packages/playwright/src/mcp/browser/tools/utils.ts b/packages/playwright/src/mcp/browser/tools/utils.tsindex 0c1967b121..7b2fa305f0 100644--- a/packages/playwright/src/mcp/browser/tools/utils.ts+++ b/packages/playwright/src/mcp/browser/tools/utils.ts@@ -63,3 +63,27 @@ export function dateAsFileName(extension: string): string {const date = new Date();return `page-${date.toISOString().replace(/[:.]/g, '-')}.${extension}`;}++export function eventWaiter<T>(page: playwright.Page, event: string, timeout: number): { promise: Promise<T | undefined>, abort: () => void } {+ const disposables: (() => void)[] = [];++ const eventPromise = new Promise<T | undefined>((resolve, reject) => {+ page.on(event as any, resolve as any);+ disposables.push(() => page.off(event as any, resolve as any));+ });++ let abort: () => void;+ const abortPromise = new Promise<T | undefined>((resolve, reject) => {+ abort = () => resolve(undefined);+ });++ const timeoutPromise = new Promise<T | undefined>(f => {+ const timeoutId = setTimeout(() => f(undefined), timeout);+ disposables.push(() => clearTimeout(timeoutId));+ });++ return {+ promise: Promise.race([eventPromise, abortPromise, timeoutPromise]).finally(() => disposables.forEach(dispose => dispose())),+ abort: abort!+ };+}