Skip to content

fix(trace): show waitForLoadState when event has already fired #17826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yury-s merged 2 commits into from
Oct 7, 2022
Merged

fix(trace): show waitForLoadState when event has already fired #17826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6629648
fix(trace): show waitForLoadState when event has already fired
yury-s Oct 4, 2022
0addee1
Return LifecycleEvent back
yury-s Oct 5, 2022
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
14 changes: 8 additions & 6 deletions packages/playwright-core/src/client/frame.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,16 @@ export class Frame extends ChannelOwner<channels.FrameChannel> implements api.Fr

async waitForLoadState(state: LifecycleEvent = 'load', options: { timeout?: number } = {}): Promise<void> {
state = verifyLoadState('state', state);
if (this._loadStates.has(state))
return;
return this._page!._wrapApiCall(async () => {
const waiter = this._setupNavigationWaiter(options);
await waiter.waitForEvent<LifecycleEvent>(this._eventEmitter, 'loadstate', s => {
waiter.log(` "${s}" event fired`);
return s === state;
});
if (this._loadStates.has(state)) {
waiter.log(` not waiting, "${state}" event already fired`);
} else {
await waiter.waitForEvent<LifecycleEvent>(this._eventEmitter, 'loadstate', s => {
waiter.log(` "${s}" event fired`);
return s === state;
});
}
waiter.dispose();
});
}
Expand Down
12 changes: 12 additions & 0 deletions tests/library/trace-viewer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,3 +717,15 @@ test('should serve overridden request', async ({ page, runAndTrace, server }) =>
expect(color).toBe('rgb(255, 0, 0)');
});

test('should display waitForLoadState even if did not wait for it', async ({ runAndTrace, server, page }) => {
const traceViewer = await runAndTrace(async () => {
await page.goto(server.EMPTY_PAGE);
await page.waitForLoadState('load');
await page.waitForLoadState('load');
});
await expect(traceViewer.actionTitles).toHaveText([
/page.goto/,
/page.waitForLoadState/,
/page.waitForLoadState/,
]);
});