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
chore: minor grid versioning fixes (#39266)
Pavel Feldman0ffb1d066349
diff --git a/packages/devtools/src/devtools.tsx b/packages/devtools/src/devtools.tsxindex 5d886e16f3..520f7577db 100644--- a/packages/devtools/src/devtools.tsx+++ b/packages/devtools/src/devtools.tsx@@ -351,7 +351,7 @@ export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {onKeyDown={onOmniboxKeyDown}onFocus={e => e.target.select()}/>- <button+ {false && <buttonclassName={'nav-btn' + (picking ? ' active-toggle' : '')}title={picking ? 'Cancel pick locator' : 'Pick locator'}onClick={() => {@@ -368,7 +368,8 @@ export const DevTools: React.FC<{ wsUrl?: string }> = ({ wsUrl }) => {<path d='M18 42h-7.5c-3 0-4.5-1.5-4.5-4.5v-27C6 7.5 7.5 6 10.5 6h27C42 6 42 10.404 42 10.5V18h-3V9H9v30h9v3Zm27-15-9 6 9 9-3 3-9-9-6 9-6-24 24 6Z'/></svg></button>- {selectedTab?.inspectorUrl && (+ }+ {false && selectedTab?.inspectorUrl && (<buttonclassName={'nav-btn' + (showInspector ? ' active-toggle' : '')}title={showInspector ? 'Hide Chrome DevTools' : 'Show Chrome DevTools'}diff --git a/packages/devtools/src/devtoolsChannel.ts b/packages/devtools/src/devtoolsChannel.tsindex b2b59156e5..2ee00d3665 100644--- a/packages/devtools/src/devtoolsChannel.ts+++ b/packages/devtools/src/devtoolsChannel.ts@@ -23,6 +23,7 @@ export type DevToolsChannelEvents = {};export interface DevToolsChannel {+ version: 1;tabs(): Promise<{ tabs: Tab[] }>;selectTab(params: { pageId: string }): Promise<void>;closeTab(params: { pageId: string }): Promise<void>;diff --git a/packages/devtools/src/grid.css b/packages/devtools/src/grid.cssindex e07eba0fad..2f330dfad8 100644--- a/packages/devtools/src/grid.css+++ b/packages/devtools/src/grid.css@@ -144,7 +144,8 @@color: var(--fg-muted);}-.session-chip.disconnected {+.session-chip.disconnected,+.session-chip.not-supported {opacity: 0.6;cursor: default;}diff --git a/packages/devtools/src/grid.tsx b/packages/devtools/src/grid.tsxindex 0850da8584..42640a3ba3 100644--- a/packages/devtools/src/grid.tsx+++ b/packages/devtools/src/grid.tsx@@ -43,7 +43,7 @@ export const Grid: React.FC<{ model: SessionModel }> = ({ model }) => {const workspaceGroups = React.useMemo(() => {const groups = new Map<string, SessionStatus[]>();for (const session of sessions) {- const key = session.config.workspaceDir || 'Unknown';+ const key = session.config.workspaceDir || 'Global';let list = groups.get(key);if (!list) {list = [];@@ -67,16 +67,16 @@ export const Grid: React.FC<{ model: SessionModel }> = ({ model }) => {{!model.loading && !model.error && sessions.length === 0 && <div className='grid-empty'>No sessions found.</div>}<div className='workspace-list'>- {workspaceGroups.map(([workspace, entries]) => {- const isCurrent = workspace === clientInfo?.workspaceDir;- const isExpanded = isCurrent || expandedWorkspaces.has(workspace);+ {workspaceGroups.map(([workspace, entries], index) => {+ const isFirst = index === 0;+ const isExpanded = isFirst || expandedWorkspaces.has(workspace);return (<div key={workspace} className='workspace-group'><div- className={'workspace-header' + (isCurrent ? '' : ' collapsible')}- onClick={isCurrent ? undefined : () => toggleWorkspace(workspace)}+ className={'workspace-header' + (isFirst ? '' : ' collapsible')}+ onClick={isFirst ? undefined : () => toggleWorkspace(workspace)}>- {!isCurrent && (+ {!isFirst && (<svg className={'workspace-chevron' + (isExpanded ? ' expanded' : '')} viewBox='0 0 24 24' fill='none' stroke='currentColor' strokeWidth='2' strokeLinecap='round' strokeLinejoin='round'><polyline points='9 18 15 12 9 6'/></svg>@@ -123,11 +123,12 @@ const SessionChip: React.FC<{ config: SessionConfig; canConnect: boolean; visibl}, [channel]);const chipTitle = selectedTab ? `[${config.name}] ${selectedTab.url} \u2014 ${selectedTab.title}` : config.name;+ const clickable = canConnect && wsUrl !== null;return (- <a className={'session-chip' + (canConnect ? '' : ' disconnected')} href={canConnect ? href : undefined} title={chipTitle} onClick={e => {+ <a className={'session-chip' + (canConnect ? '' : ' disconnected') + (wsUrl === null ? ' not-supported' : '')} href={clickable ? href : undefined} title={chipTitle} onClick={e => {e.preventDefault();- if (canConnect)+ if (clickable)navigate(href);}}><div className='session-chip-header'>@@ -172,6 +173,8 @@ const SessionChip: React.FC<{ config: SessionConfig; canConnect: boolean; visibl<div className='screencast-container'>{channel && <Screencast channel={channel} />}{!canConnect && <div className='screencast-placeholder'>Session closed</div>}+ {canConnect && !channel && wsUrl === null && <div className='screencast-placeholder'>Not supported — v{config.version}</div>}+ {canConnect && !channel && wsUrl === undefined && <div className='screencast-placeholder'>Connecting</div>}</div></a>);diff --git a/packages/devtools/src/index.tsx b/packages/devtools/src/index.tsxindex 3c10d96c8c..e4ca64df8a 100644--- a/packages/devtools/src/index.tsx+++ b/packages/devtools/src/index.tsx@@ -55,8 +55,11 @@ const App: React.FC = () => {return () => window.removeEventListener('popstate', onPopState);}, []);- if (socketPath)- return <DevTools wsUrl={model.wsUrls.get(socketPath)} />;+ if (socketPath) {+ const wsUrl = model.wsUrls.get(socketPath);+ if (wsUrl)+ return <DevTools wsUrl={wsUrl} />;+ }return <Grid model={model} />;};diff --git a/packages/devtools/src/sessionModel.ts b/packages/devtools/src/sessionModel.tsindex 15b132d255..e0512cbd37 100644--- a/packages/devtools/src/sessionModel.ts+++ b/packages/devtools/src/sessionModel.ts@@ -25,7 +25,7 @@ type Listener = () => void;export class SessionModel {sessions: SessionStatus[] = [];- readonly wsUrls: Map<string, string> = new Map();+ readonly wsUrls: Map<string, string | null> = new Map();clientInfo: ClientInfo | undefined;error: string | undefined;loading = true;@@ -132,8 +132,10 @@ export class SessionModel {if (resp.ok) {const { url } = await resp.json();this.wsUrls.set(config.socketPath, url);- this._notify();+ } else {+ this.wsUrls.set(config.socketPath, null);}+ this._notify();}).catch(() => {this._knownTimestamps.delete(config.socketPath);});diff --git a/packages/devtools/src/transport.ts b/packages/devtools/src/transport.tsindex 61399adc17..85471689b3 100644--- a/packages/devtools/src/transport.ts+++ b/packages/devtools/src/transport.ts@@ -19,6 +19,7 @@ export class Transport {private _lastId = 0;private _pending = new Map<number, { resolve: (result: any) => void; reject: (error: Error) => void }>();private _sendQueue: string[] | undefined = [];+ private _closed = false;onopen?: () => void;onevent?: (method: string, params: any) => void;@@ -56,6 +57,8 @@ export class Transport {}};this._ws.onclose = (event: CloseEvent) => {+ this._closed = true;+ this._sendQueue = undefined;for (const { reject } of this._pending.values())reject(new Error('Connection closed'));this._pending.clear();@@ -70,6 +73,8 @@ export class Transport {}send(method: string, params?: any): Promise<any> {+ if (this._closed)+ return Promise.reject(new Error('Connection closed'));const id = ++this._lastId;const message = JSON.stringify({ id, method, params });if (this._sendQueue)diff --git a/packages/playwright-core/src/server/devtoolsController.ts b/packages/playwright-core/src/server/devtoolsController.tsindex f214fbf9cb..499bdac423 100644--- a/packages/playwright-core/src/server/devtoolsController.ts+++ b/packages/playwright-core/src/server/devtoolsController.ts@@ -60,6 +60,8 @@ export class DevToolsController {}class DevToolsConnection implements Transport, DevToolsChannel {+ readonly version = 1;+sendEvent?: (method: string, params: any) => void;close?: () => void;@@ -79,8 +81,6 @@ class DevToolsConnection implements Transport, DevToolsChannel {this._controllerUrl = controllerUrl;}- // -- IDevToolsConnection: event subscription ---on<K extends keyof DevToolsChannelEvents>(event: K, listener: (params: DevToolsChannelEvents[K]) => void): void {let set = this._eventListeners.get(event);if (!set) {@@ -94,7 +94,6 @@ class DevToolsConnection implements Transport, DevToolsChannel {this._eventListeners.get(event)?.delete(listener);}- /** Sends an event to the remote client and notifies local listeners. */private _emit<K extends keyof DevToolsChannelEvents>(event: K, params: DevToolsChannelEvents[K]): void {this.sendEvent?.(event, params);const set = this._eventListeners.get(event);@@ -104,8 +103,6 @@ class DevToolsConnection implements Transport, DevToolsChannel {}}- // -- Transport: lifecycle ---onconnect() {const context = this._context;@@ -145,14 +142,10 @@ class DevToolsConnection implements Transport, DevToolsChannel {this._contextListeners = [];}- // -- Transport: dispatch (skeleton) ---async dispatch(method: string, params: any): Promise<any> {return (this as any)[method]?.(params);}- // -- IDevToolsConnection: RPC method implementations ---async selectTab(params: { pageId: string }) {const page = this._context.pages().find(p => p.guid === params.pageId);if (page)@@ -242,21 +235,10 @@ class DevToolsConnection implements Transport, DevToolsChannel {await ProgressController.runInternalTask(async progress => { await page.keyboard.up(progress, params.key); });}- async pickLocator() {- await this._startPicking();- }-- async cancelPickLocator() {- this._cancelPicking();- }-- // -- Internal helpers ---private async _selectPage(page: Page) {if (this.selectedPage === page)return;- // Stop screencast on old page.if (this.selectedPage) {eventsHelper.removeEventListeners(this._pageListeners);this._pageListeners = [];@@ -268,7 +250,6 @@ class DevToolsConnection implements Transport, DevToolsChannel {this._lastViewportSize = null;this._sendTabList();- // Start screencast on new page.this._pageListeners.push(eventsHelper.addEventListener(page, Page.Events.ScreencastFrame, frame => this._writeFrame(frame.buffer, frame.width, frame.height)));@@ -288,7 +269,7 @@ class DevToolsConnection implements Transport, DevToolsChannel {this._lastViewportSize = null;}- private async _startPicking() {+ async pickLocator() {this._cancelPicking();const recorder = await Recorder.forContext(this._context, { omitCallTracking: true });this._recorder = recorder;@@ -301,6 +282,10 @@ class DevToolsConnection implements Transport, DevToolsChannel {recorder.setMode('inspecting');}+ async cancelPickLocator() {+ this._cancelPicking();+ }+private _cancelPicking() {eventsHelper.removeEventListeners(this._recorderListeners);this._recorderListeners = [];diff --git a/packages/playwright/src/cli/client/devtoolsApp.ts b/packages/playwright/src/cli/client/devtoolsApp.tsindex 60684a2f39..e5056d2e5b 100644--- a/packages/playwright/src/cli/client/devtoolsApp.ts+++ b/packages/playwright/src/cli/client/devtoolsApp.ts@@ -65,8 +65,6 @@ async function handleApiRequest(clientInfo: ClientInfo, request: http.IncomingMeconst canConnect = await session.canConnect();if (canConnect || entry.config.cli.persistent)sessions.push({ config: entry.config, canConnect });- else- await session.deleteSessionConfig();}}sendJSON(response, { sessions, clientInfo });diff --git a/packages/playwright/src/cli/client/program.ts b/packages/playwright/src/cli/client/program.tsindex 0478304641..1db729dc53 100644--- a/packages/playwright/src/cli/client/program.ts+++ b/packages/playwright/src/cli/client/program.ts@@ -157,6 +157,10 @@ async function program() {if (entry)await new Session(clientInfo, entry.config).stop(true);const session = new Session(clientInfo, sessionConfigFromArgs(clientInfo, sessionName, args));+ // Stale session.+ if (await session.canConnect())+ await session.stop(true);+for (const globalOption of globalOptions)delete args[globalOption];const result = await session.run(args);