Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(selector generator): properly escape re used in has-text (#30767)

Browse source 
Fixes #30499.
This commit is contained in:
Dmitry Gozman 2024-05-13 12:40:46 -07:00 committed by GitHub
parent 64b4ac1732
commit 8334191b94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/playwright-core/src/server/injected/selectorGenerator.ts
View file

@ -325,8 +325,10 @@ function buildTextCandidates(injectedScript: InjectedScript, element: Element, i
const cssToken: SelectorToken = { engine: 'css', selector: cssEscape(element.nodeName.toLowerCase()), score: kCSSTagNameScore }; const cssToken: SelectorToken = { engine: 'css', selector: cssEscape(element.nodeName.toLowerCase()), score: kCSSTagNameScore };
for (const alternative of alternatives) for (const alternative of alternatives)
candidates.push([cssToken, { engine: 'internal:has-text', selector: escapeForTextSelector(alternative.text, false), score: kTextScore - alternative.scoreBouns }]); candidates.push([cssToken, { engine: 'internal:has-text', selector: escapeForTextSelector(alternative.text, false), score: kTextScore - alternative.scoreBouns }]);
if (text.length <= 80) if (text.length <= 80) {
candidates.push([cssToken, { engine: 'internal:has-text', selector: '/^' + escapeRegExp(text) + '$/', score: kTextScoreRegex }]); const re = new RegExp('^' + escapeRegExp(text) + '$');
candidates.push([cssToken, { engine: 'internal:has-text', selector: escapeForTextSelector(re, false), score: kTextScoreRegex }]);
}
} }
const ariaRole = getAriaRole(element); const ariaRole = getAriaRole(element);

9
tests/library/selector-generator.spec.ts
View file

@ -203,6 +203,15 @@ it.describe('selector generator', () => {
expect(await generate(page, 'div div')).toBe(`div >> internal:has-text=/^Hello world$/`); expect(await generate(page, 'div div')).toBe(`div >> internal:has-text=/^Hello world$/`);
}); });
it('should use internal:has-text with regexp with a quote', async ({ page }) => {
await page.setContent(`
<span>Hello'world</span>
<div><div>Hello'<span>world</span></div>extra</div>
<a>Goodbye'<span>world</span></a>
`);
expect(await generate(page, 'div div')).toBe(`div >> internal:has-text=/^Hello\\'world$/`);
});
it('should chain text after parent', async ({ page }) => { it('should chain text after parent', async ({ page }) => {
await page.setContent(` await page.setContent(`
<div>Hello <span>world</span></div> <div>Hello <span>world</span></div>