Skip to content

Commit e312845

Browse files
authored
fix: less confusing error message (#2305)
Fixes #2283
1 parent 545c43d commit e312845

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

src/frames.ts

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ export class Frame {
451451

452452
const deadline = this._page._timeoutSettings.computeDeadline(options);
453453
const { world, task } = selectors._waitForSelectorTask(selector, state, deadline);
454-
const result = await this._scheduleRerunnableTask(task, world, deadline, `selector "${selectorToString(selector, state)}"`);
454+
const result = await this._scheduleRerunnableTask(task, world, deadline, `selector "${selector}"${state === 'attached' ? '' : ' to be ' + state}`);
455455
if (!result.asElement()) {
456456
result.dispose();
457457
return null;
@@ -469,7 +469,7 @@ export class Frame {
469469
async dispatchEvent(selector: string, type: string, eventInit?: Object, options?: types.TimeoutOptions): Promise<void> {
470470
const deadline = this._page._timeoutSettings.computeDeadline(options);
471471
const task = selectors._dispatchEventTask(selector, type, eventInit || {}, deadline);
472-
const result = await this._scheduleRerunnableTask(task, 'main', deadline, `selector "${selectorToString(selector, 'attached')}"`);
472+
const result = await this._scheduleRerunnableTask(task, 'main', deadline, `selector "${selector}"`);
473473
result.dispose();
474474
}
475475

@@ -970,17 +970,6 @@ class RerunnableTask {
970970
}
971971
}
972972

973-
function selectorToString(selector: string, state: 'attached' | 'detached' | 'visible' | 'hidden'): string {
974-
let label;
975-
switch (state) {
976-
case 'visible': label = '[visible] '; break;
977-
case 'hidden': label = '[hidden] '; break;
978-
case 'attached': label = ''; break;
979-
case 'detached': label = '[detached]'; break;
980-
}
981-
return `${label}${selector}`;
982-
}
983-
984973
export class SignalBarrier {
985974
private _options: types.NavigatingActionWaitOptions;
986975
private _protectCount = 0;

test/waittask.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ describe('Frame.waitForSelector', function() {
341341
let error = null;
342342
await page.waitForSelector('div', { state: 'hidden', timeout: 1000 }).catch(e => error = e);
343343
expect(error).toBeTruthy();
344-
expect(error.message).toContain('waiting for selector "[hidden] div" failed: timeout');
344+
expect(error.message).toContain('waiting for selector "div" to be hidden failed: timeout');
345345
});
346346
it('should respond to node attribute mutation', async({page, server}) => {
347347
let divFound = false;

0 commit comments

Comments
 (0)