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: make InjectedScript know the frameSeq (#41635)
Dmitry Gozmanbd93b1441e23
diff --git a/packages/injected/src/injectedScript.ts b/packages/injected/src/injectedScript.tsindex bb72c31e4a..0ce7c80dd9 100644--- a/packages/injected/src/injectedScript.ts+++ b/packages/injected/src/injectedScript.ts@@ -78,6 +78,7 @@ interface WebKitLegacyDeviceMotionEvent extends DeviceMotionEvent {export type InjectedScriptOptions = {isUnderTest: boolean;sdkLanguage: Language;+ frameSeq: number;// For strict error and codegentestIdAttributeName: string;stableRafCount: number;@@ -99,6 +100,7 @@ export class InjectedScript {private _highlight: Highlight | undefined;readonly isUnderTest: boolean;private _sdkLanguage: Language;+ private _frameSeq: number;private _testIdAttributeNameForStrictErrorAndConsoleCodegen: string = 'data-testid';readonly window: Window & typeof globalThis;readonly document: Document;@@ -141,6 +143,7 @@ export class InjectedScript {// inside a trace viewer snapshot, where "window" differs from "globalThis".this.utils.builtins = new UtilityScript(window, options.isUnderTest).builtins;this._sdkLanguage = options.sdkLanguage;+ this._frameSeq = options.frameSeq;this._testIdAttributeNameForStrictErrorAndConsoleCodegen = options.testIdAttributeName;this._evaluator = new SelectorEvaluatorImpl();this.consoleApi = new ConsoleAPI(this);@@ -318,6 +321,7 @@ export class InjectedScript {ariaSnapshotWithRefs(node: Node, options: AriaTreeOptions & { depth?: number }): { text: string, iframeRefs: string[], iframeDepths: Record<string, number> } {if (node.nodeType !== Node.ELEMENT_NODE)throw this.createStacklessError('Can only capture aria snapshot of Element nodes.');+ options = { ...options, refPrefix: this._frameSeq && options.mode === 'ai' ? 'f' + this._frameSeq : '' };const ariaSnapshot = generateAriaTree(node as Element, options);const rendered = renderAriaTree(ariaSnapshot, options);this._lastAriaSnapshotForQuery = ariaSnapshot;diff --git a/packages/playwright-core/src/server/dom.ts b/packages/playwright-core/src/server/dom.tsindex c58c902914..c46aa5ebed 100644--- a/packages/playwright-core/src/server/dom.ts+++ b/packages/playwright-core/src/server/dom.ts@@ -91,6 +91,7 @@ export class FrameExecutionContext extends js.ExecutionContext {const options: InjectedScriptOptions = {isUnderTest: isUnderTest(),sdkLanguage,+ frameSeq: this.frame.seq,testIdAttributeName: selectorsRegistry.testIdAttributeName(),stableRafCount: this.frame._page.delegate.rafCountForStablePosition(),browserName: this.frame._page.browserContext._browser.options.name,diff --git a/packages/playwright-core/src/server/page.ts b/packages/playwright-core/src/server/page.tsindex 39537e0598..1a576e209d 100644--- a/packages/playwright-core/src/server/page.ts+++ b/packages/playwright-core/src/server/page.ts@@ -1121,7 +1121,6 @@ export async function ariaSnapshotForFrame(progress: Progress, frame: frames.Frareturn injected.ariaSnapshotWithRefs(element, options);}, {mode: options.mode ?? 'default',- refPrefix: resolvedFrame.seq ? 'f' + resolvedFrame.seq : '',doNotRenderActive: options.doNotRenderActive,info: resolved.info,depth: options.depth,diff --git a/packages/trace-viewer/src/ui/snapshotTab.tsx b/packages/trace-viewer/src/ui/snapshotTab.tsxindex 6045b89935..dd24dd8c04 100644--- a/packages/trace-viewer/src/ui/snapshotTab.tsx+++ b/packages/trace-viewer/src/ui/snapshotTab.tsx@@ -86,7 +86,7 @@ export const SnapshotTabsView: React.FunctionComponent<{<ToolbarButton icon='link-external' title='Open snapshot in a new tab' disabled={!snapshotUrls?.popoutUrl} onClick={() => {const win = window.open(snapshotUrls?.popoutUrl || '', '_blank');win?.addEventListener('DOMContentLoaded', () => {- const injectedScript = new InjectedScript(win as any, { isUnderTest, sdkLanguage, testIdAttributeName, stableRafCount: 1, browserName: 'chromium', customEngines: [] });+ const injectedScript = new InjectedScript(win as any, { isUnderTest, frameSeq: 0, sdkLanguage, testIdAttributeName, stableRafCount: 1, browserName: 'chromium', customEngines: [] });injectedScript.consoleApi.install();});}} />@@ -311,7 +311,7 @@ function createRecorders(recorders: { recorder: Recorder, frameSelector: stringreturn;const win = frameWindow as any;if (!win._recorder && force) {- const injectedScript = new InjectedScript(frameWindow as any, { isUnderTest, sdkLanguage, testIdAttributeName, stableRafCount: 1, browserName: 'chromium', customEngines: [] });+ const injectedScript = new InjectedScript(frameWindow as any, { isUnderTest, frameSeq: 0, sdkLanguage, testIdAttributeName, stableRafCount: 1, browserName: 'chromium', customEngines: [] });const recorder = new Recorder(injectedScript);win._injectedScript = injectedScript;win._recorder = { recorder, frameSelector: parentFrameSelector };