Skip to content
Merged
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
17 changes: 14 additions & 3 deletions src/server/dom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,22 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {

async _retryPointerAction(progress: Progress, actionName: string, waitForEnabled: boolean, action: (point: types.Point) => Promise<void>,
options: types.PointerActionOptions & types.PointerActionWaitOptions & types.NavigatingActionWaitOptions): Promise<'error:notconnected' | 'done'> {
let first = true;
let retry = 0;
// We progressively wait longer between retries, up to 500ms.
const waitTime = [0, 20, 100, 500];
while (progress.isRunning()) {
progress.log(`${first ? 'attempting' : 'retrying'} ${actionName} action`);
if (retry) {
progress.log(`retrying ${actionName} action, attempt #${retry}`);
const timeout = waitTime[Math.min(retry - 1, waitTime.length - 1)];
if (timeout) {
progress.log(` waiting ${timeout}ms`);
await this._evaluateInUtility(([injected, node, timeout]) => new Promise(f => setTimeout(f, timeout)), timeout);
}
} else {
progress.log(`attempting ${actionName} action`);
}
const result = await this._performPointerAction(progress, actionName, waitForEnabled, action, options);
first = false;
++retry;
if (result === 'error:notvisible') {
if (options.force)
throw new Error('Element is not visible');
Expand Down
1 change: 1 addition & 0 deletions test/click-timeout-3.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ it('should timeout waiting for hit target', async ({page, server}) => {
expect(error.message).toContain('elementHandle.click: Timeout 5000ms exceeded.');
expect(error.message).toContain('<div id="blocker"></div> intercepts pointer events');
expect(error.message).toContain('retrying click action');
expect(error.message).toContain('waiting 500ms');
});

it('should report wrong hit target subtree', async ({page, server}) => {
Expand Down