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

add comment

Browse source
This commit is contained in:
Simon Knott 2024-10-23 15:30:54 +02:00
parent 27114967a5
commit 57161394e3
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/playwright-core/src/utils/isomorphic/locatorGenerators.ts
View file

@ -158,20 +158,19 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
} }
} }
if (part.name === 'internal:control' && (part.body as string) === 'enter-frame') { if (part.name === 'internal:control' && (part.body as string) === 'enter-frame') {
// transform last tokens from `${selector}` into `${selector}.contentFrame()` and `frameLocator(${selector})`
const lastTokens = tokens[tokens.length - 1]; const lastTokens = tokens[tokens.length - 1];
const lastPart = parts[index - 1]; const lastPart = parts[index - 1];
const extendedTokens = lastTokens.map(token => const transformed = lastTokens.map(token => factory.chainLocators([token, factory.generateLocator(base, 'frame', '')]));
factory.chainLocators([token, factory.generateLocator(base, 'frame', '')])
);
if (['xpath', 'css'].includes(lastPart.name)) { if (['xpath', 'css'].includes(lastPart.name)) {
extendedTokens.push( transformed.push(
factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] })), factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] })),
factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] }, true)) factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] }, true))
); );
} }
lastTokens.splice(0, lastTokens.length, ...extendedTokens); lastTokens.splice(0, lastTokens.length, ...transformed);
nextBase = 'frame-locator'; nextBase = 'frame-locator';
continue; continue;
} }