Skip to content
Open
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
10 changes: 5 additions & 5 deletions packages/playwright-core/src/server/recorder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import type { RegisteredListener } from '@utils/eventsHelper';
const recorderSymbol = Symbol('recorderSymbol');

type BindingSource = { frame: Frame, page: Page };
type RecorderParams = channels.BrowserContextEnableRecorderParams & { hideToolbar?: boolean };
type RecorderParams = channels.BrowserContextEnableRecorderParams & { hideToolbar?: boolean, __testHookFrameSelectorTimeout?: number };

export const RecorderEvent = {
PausedStateChanged: 'pausedStateChanged',
Expand Down Expand Up @@ -194,7 +194,7 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrume
});

await this._context.exposeBinding(progress, '__pw_recorderElementPicked', async ({ frame }, elementInfo: ElementInfo) => {
const selector = await buildFullSelectorForFrame(progress, frame, elementInfo.selector);
const selector = await buildFullSelectorForFrame(progress, frame, elementInfo.selector, this._params.__testHookFrameSelectorTimeout);
this.emit(RecorderEvent.ElementPicked, { selector, ariaSnapshot: elementInfo.ariaSnapshot }, true);
});

Expand Down Expand Up @@ -540,15 +540,15 @@ export class Recorder extends EventEmitter<RecorderEventMap> implements Instrume
}

private async _performAction(progress: Progress, frame: Frame, action: actions.PerformableAction) {
const selector = await buildFullSelectorForFrame(progress, frame, action.selector);
const selector = await buildFullSelectorForFrame(progress, frame, action.selector, this._params.__testHookFrameSelectorTimeout);
await performAction(progress, frame._page.mainFrame(), { ...action, selector });
}

private async _recordAction(progress: Progress, frame: Frame, action: actions.Action, preconditionSelector?: string) {
if (preconditionSelector)
this._signalProcessor.signal(frame, { name: 'expect', selector: await buildFullSelectorForFrame(progress, frame, preconditionSelector) });
this._signalProcessor.signal(frame, { name: 'expect', selector: await buildFullSelectorForFrame(progress, frame, preconditionSelector, this._params.__testHookFrameSelectorTimeout) });
if ('selector' in action)
action.selector = await buildFullSelectorForFrame(progress, frame, action.selector);
action.selector = await buildFullSelectorForFrame(progress, frame, action.selector, this._params.__testHookFrameSelectorTimeout);
const actionInContext: actions.ActionInContext = {
pageGuid: frame._page.guid,
action,
Expand Down
14 changes: 7 additions & 7 deletions packages/playwright-core/src/server/recorder/recorderUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ function buildFullSelector(framePath: string[], selector: string) {
return [...framePath, selector].join(' >> internal:control=enter-frame >> ');
}

export async function buildFullSelectorForFrame(progress: Progress, frame: Frame, selector: string): Promise<string> {
const framePath = await generateFrameSelector(progress, frame);
export async function buildFullSelectorForFrame(progress: Progress, frame: Frame, selector: string, timeout = 2000): Promise<string> {
const framePath = await generateFrameSelector(progress, frame, timeout);
if (!frame._page.browserContext._options.pierceFrames || !framePath.length)
return buildFullSelector(framePath, selector);

Expand All @@ -40,7 +40,7 @@ export async function buildFullSelectorForFrame(progress: Progress, frame: Frame
if (await resolvesToFrame(progress, candidate, frame))
return candidate;
}
}, monotonicTime() + 2000));
}, monotonicTime() + timeout));
if (!result.timedOut && result.result)
return result.result;

Expand Down Expand Up @@ -83,22 +83,22 @@ export function metadataToCallLog(metadata: CallMetadata, status: CallLogStatus)
}


async function generateFrameSelector(progress: Progress, frame: Frame): Promise<string[]> {
async function generateFrameSelector(progress: Progress, frame: Frame, timeout: number): Promise<string[]> {
const selectorPromises: Promise<string>[] = [];
progress.setAllowConcurrentOrNestedRaces(true);
while (frame) {
const parent = frame.parentFrame();
if (!parent)
break;
selectorPromises.push(generateFrameSelectorInParent(progress, parent, frame));
selectorPromises.push(generateFrameSelectorInParent(progress, parent, frame, timeout));
frame = parent;
}
const result = await Promise.all(selectorPromises);
progress.setAllowConcurrentOrNestedRaces(false);
return result.reverse();
}

async function generateFrameSelectorInParent(prgoress: Progress, parent: Frame, frame: Frame): Promise<string> {
async function generateFrameSelectorInParent(prgoress: Progress, parent: Frame, frame: Frame, timeout: number): Promise<string> {
const result = await raceAgainstDeadline(async () => {
try {
const frameElement = await frame.frameElement(prgoress);
Expand All @@ -112,7 +112,7 @@ async function generateFrameSelectorInParent(prgoress: Progress, parent: Frame,
return selector;
} catch (e) {
}
}, monotonicTime() + 2000);
}, monotonicTime() + timeout);
if (!result.timedOut && result.result)
return result.result;

Expand Down
6 changes: 4 additions & 2 deletions tests/library/inspector/cli-codegen-3.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1166,8 +1166,10 @@ test.describe('cli codegen with pierceFrames', () => {
await page.getByText('Hello2').click();`);
});

test('should prepend the frame selector to disambiguate', async ({ openRecorder, server }) => {
const { page, recorder } = await openRecorder();
test('should prepend the frame selector to disambiguate', async ({ openRecorder, server, browserName, isMac }) => {
const { page, recorder } = await openRecorder({
__testHookFrameSelectorTimeout: browserName === 'firefox' && isMac && process.arch === 'x64' ? 10_000 : undefined,
});
await recorder.setContentAndWait(`
<iframe id=frame1 srcdoc="<iframe srcdoc='<button>Hello</button>'></iframe>"></iframe>
<iframe id=frame2 srcdoc="<iframe srcdoc='<button>Hello</button>'></iframe>"></iframe>
Expand Down
2 changes: 1 addition & 1 deletion tests/library/inspector/inspectorTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export { expect } from '@playwright/test';
type CLITestArgs = {
recorderPageGetter: () => Promise<Page>;
closeRecorder: () => Promise<void>;
openRecorder: (options?: { testIdAttributeName?: string, language?: string }) => Promise<{ recorder: Recorder, page: Page }>;
openRecorder: (options?: { testIdAttributeName?: string, language?: string, __testHookFrameSelectorTimeout?: number }) => Promise<{ recorder: Recorder, page: Page }>;
runCLI: (args: string[]) => CLIMock;
};

Expand Down