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

mess with the previous token

Browse source
This commit is contained in:
Simon Knott 2024-10-22 12:08:07 +02:00
parent 2cacd129e8
commit e1e9b66551
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
2 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -157,6 +157,23 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
continue; continue;
} }
} }
if (part.name === 'internal:control' && (part.body as string) === 'enter-frame') {
const lastTokens = tokens[tokens.length - 1];
const lastPart = parts[index - 1];
const extendedTokens = lastTokens.map(token =>
factory.chainLocators([token, factory.generateLocator(base, 'frame', '')])
);
extendedTokens.push(
factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] }))
);
if (['xpath', 'css'].includes(lastPart.name))
extendedTokens.push(factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [lastPart] }, true)));
lastTokens.splice(0, lastTokens.length, ...extendedTokens)
nextBase = 'frame-locator';
continue;
}
const nextPart = parts[index + 1]; const nextPart = parts[index + 1];
@ -190,32 +207,6 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
locatorPartWithEngine = factory.generateLocator(base, 'default', selectorPart); locatorPartWithEngine = factory.generateLocator(base, 'default', selectorPart);
} }
if (nextPart && nextPart.name === 'internal:control' && (nextPart.body as string) === 'enter-frame') {
// two options plus engine name:
// - locator('iframe').contentFrame()
// - locator('css|xpath=iframe').contentFrame()
// - frameLocator('iframe')
// - frameLocator('css|xpath=iframe')
const contentFrame = factory.generateLocator(base, 'frame', '')
const options = [
factory.chainLocators([locatorPart, contentFrame]),
factory.generateLocator(base, 'frame-locator', selectorPart),
]
if (locatorPartWithEngine) {
options.push(
factory.chainLocators([locatorPartWithEngine, contentFrame]),
factory.generateLocator(base, 'frame-locator', stringifySelector({ parts: [part] }, /* forceEngineName */ true)),
)
}
tokens.push(options);
nextBase = 'frame-locator';
index++;
continue;
}
tokens.push([locatorPart, locatorPartWithEngine].filter(Boolean) as string[]); tokens.push([locatorPart, locatorPartWithEngine].filter(Boolean) as string[]);
} }

2
tests/library/locator-generator.spec.ts
View file

@ -589,7 +589,7 @@ it('parseLocator frames', async () => {
expect.soft(parseLocator('javascript', `locator('iframe').contentFrame().getByText('foo')`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`); expect.soft(parseLocator('javascript', `locator('iframe').contentFrame().getByText('foo')`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
expect.soft(parseLocator('javascript', `frameLocator('iframe').getByText('foo')`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`); expect.soft(parseLocator('javascript', `frameLocator('iframe').getByText('foo')`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
expect.soft(parseLocator('javascript', `frameLocator('css=iframe').getByText('foo')`, '')).toBe(`css=iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`); expect.soft(parseLocator('javascript', `frameLocator('css=iframe').getByText('foo')`, '')).toBe(`css=iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
expect.soft(parseLocator('javascript', `page.getByTitle('iframe title').contentFrame()`)).toBe(`internal:text=\"iframe title\"i >> internal:control=enter-frame`); expect.soft(parseLocator('javascript', `getByTitle('iframe title').contentFrame()`)).toBe(`internal:attr=[title=\"iframe title\"i] >> internal:control=enter-frame`);
expect.soft(parseLocator('python', `locator("iframe").content_frame.get_by_text("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`); expect.soft(parseLocator('python', `locator("iframe").content_frame.get_by_text("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);
expect.soft(parseLocator('python', `frame_locator("iframe").get_by_text("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`); expect.soft(parseLocator('python', `frame_locator("iframe").get_by_text("foo")`, '')).toBe(`iframe >> internal:control=enter-frame >> internal:text=\"foo\"i`);