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

fix(selectors): :scope combined with other css should work (#18324)

Browse source 
Previously, we considered root when selector has `:scope` modifier, but
did not actually match it with other css specifiers, like in
`:scope.selected`.

Fixes #17824.
This commit is contained in:
Dmitry Gozman 2022-10-25 14:31:39 -07:00 committed by GitHub
parent 721ae2b3ed
commit 0653692a5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/playwright-core/src/server/injected/selectorEvaluator.ts
View file

@ -206,7 +206,7 @@ export class SelectorEvaluatorImpl implements SelectorEvaluator {
if (css !== undefined) { if (css !== undefined) {
elements = this._queryCSS(context, css); elements = this._queryCSS(context, css);
const hasScopeClause = funcs.some(f => f.name === 'scope'); const hasScopeClause = funcs.some(f => f.name === 'scope');
if (hasScopeClause && context.scope.nodeType === 1 /* Node.ELEMENT_NODE */) if (hasScopeClause && context.scope.nodeType === 1 /* Node.ELEMENT_NODE */ && this._matchesCSS(context.scope as Element, css))
elements.unshift(context.scope as Element); elements.unshift(context.scope as Element);
} else { } else {
firstIndex = funcs.findIndex(func => this._getEngine(func.name).query !== undefined); firstIndex = funcs.findIndex(func => this._getEngine(func.name).query !== undefined);

1
tests/page/selectors-css.spec.ts
View file

@ -394,7 +394,6 @@ it('should work with :scope', async ({ page, server }) => {
it('should work with :scope and class', async ({ page }) => { it('should work with :scope and class', async ({ page }) => {
it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/17824' }); it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/17824' });
it.fixme();
await page.setContent(`<div class="apple"></div> await page.setContent(`<div class="apple"></div>
<div class="apple selected"></div>`); <div class="apple selected"></div>`);
const apples = page.locator('.apple'); const apples = page.locator('.apple');