chore: don't let count() throw during navigation#36941
Merged
Skn0tt merged 5 commits intomicrosoft:mainfrom Aug 11, 2025
Merged
chore: don't let count() throw during navigation#36941Skn0tt merged 5 commits intomicrosoft:mainfrom
Skn0tt merged 5 commits intomicrosoft:mainfrom
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
dgozman
reviewed
Aug 6, 2025
|
|
||
| async _queryCount(selector: string): Promise<number> { | ||
| return (await this._channel.queryCount({ selector })).value; | ||
| async _queryCount(selector: string, options?: any): Promise<number> { |
Contributor
There was a problem hiding this comment.
Instead of any, let's make it {} everywhere to designate we do not expect anything meaningful there.
|
|
||
| async count(): Promise<number> { | ||
| return await this._frame._queryCount(this._selector); | ||
| async count(options?: any): Promise<number> { |
Contributor
There was a problem hiding this comment.
Let's add a comment that options are here only for testing.
| // Be careful, |this.frame| can be different from |resolved.frame|. | ||
| if (!resolved) | ||
| throw new Error(`Failed to find frame for selector "${selector}"`); | ||
| await options.__testHookAfterStable?.(); |
Contributor
There was a problem hiding this comment.
I find the current hook name unsuitable.
Suggested change
| await options.__testHookAfterStable?.(); | |
| await options.__testHookBeforeQuery?.(); |
| try { | ||
| return await this.selectors.queryCount(selector, options); | ||
| } catch { | ||
| return 0; |
Contributor
There was a problem hiding this comment.
You should check isNonRetriableError() here. See how isVisibleInternal() does it. Let's add a test that count() throws on page closure.
| .contentFrame().locator('#f0_mid_0') | ||
| .contentFrame().locator('text=L28').or(l('text=L29'))))); | ||
| const error = await locator.count().catch(e => e); | ||
| const error = await locator.isHidden().catch(e => e); |
Contributor
There was a problem hiding this comment.
Let's revert, this one should still throw.
tests/page/locator-query.spec.ts
Outdated
| await page.setContent(`<div>A</div>`); | ||
| let triggered = false; | ||
| const __testHookAfterStable = () => { | ||
| if (triggered) |
Contributor
There was a problem hiding this comment.
How could this hook be called twice?
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
dgozman
approved these changes
Aug 11, 2025
Contributor
Test results for "tests 1"1 failed 45 flaky46610 passed, 805 skipped Merge workflow run. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #36851