Skip to content

Commit

Permalink
fix: use correct frame target (#618)
Browse files Browse the repository at this point in the history
Previous PR caused a regression here that was masked by another issue.
localFrame should be the one used for selectors. TargetPageOrFrame
should only be used to access non-local frame. Perhaps we could refactor
this in the future.
  • Loading branch information
OrKoN committed Jul 18, 2023
1 parent e8abd93 commit 9a998e4
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
30 changes: 15 additions & 15 deletions src/PuppeteerRunnerExtension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
case StepType.DoubleClick:
await locatorRace(
step.selectors.map((selector) => {
return (
targetPageOrFrame as unknown as InternalPage | InternalFrame
).locator(selectorToPElementSelector(selector));
return (localFrame as unknown as InternalFrame).locator(
selectorToPElementSelector(selector)
);
})
)
.setTimeout(timeout)
Expand All @@ -146,9 +146,9 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
case StepType.Click:
await locatorRace(
step.selectors.map((selector) => {
return (
targetPageOrFrame as unknown as InternalPage | InternalFrame
).locator(selectorToPElementSelector(selector));
return (localFrame as unknown as InternalFrame).locator(
selectorToPElementSelector(selector)
);
})
)
.setTimeout(timeout)
Expand All @@ -167,9 +167,9 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
case StepType.Hover:
await locatorRace(
step.selectors.map((selector) => {
return (
targetPageOrFrame as unknown as InternalPage | InternalFrame
).locator(selectorToPElementSelector(selector));
return (localFrame as unknown as InternalFrame).locator(
selectorToPElementSelector(selector)
);
})
)
.setTimeout(timeout)
Expand Down Expand Up @@ -209,9 +209,9 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
case StepType.Change:
await locatorRace(
step.selectors.map((selector) => {
return (
targetPageOrFrame as unknown as InternalPage | InternalFrame
).locator(selectorToPElementSelector(selector));
return (localFrame as unknown as InternalFrame).locator(
selectorToPElementSelector(selector)
);
})
)
.on('action' as LocatorEmittedEvents.Action, () =>
Expand All @@ -231,9 +231,9 @@ export class PuppeteerRunnerExtension extends RunnerExtension {
if ('selectors' in step) {
await locatorRace(
step.selectors.map((selector) => {
return (
targetPageOrFrame as unknown as InternalPage | InternalFrame
).locator(selectorToPElementSelector(selector));
return (localFrame as unknown as InternalFrame).locator(
selectorToPElementSelector(selector)
);
})
)
.on('action' as LocatorEmittedEvents.Action, () =>
Expand Down
2 changes: 1 addition & 1 deletion test/runner.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ describe('Runner', () => {
},
{
type: StepType.Click,
selectors: [['.parent', '.child']],
selectors: ['.parent > .child'],
offsetX: 1,
offsetY: 1,
},
Expand Down

0 comments on commit 9a998e4

Please sign in to comment.