Skip to content

Commit 57643ee

Browse files
author
Hwashiang Yu
committed
MC-4057: Fix attached mftf skipped tests
- Moved scrolltotop test step from drag and drop action group to the individual tests
1 parent c1af70e commit 57643ee

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
4949
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
5050
</arguments>
51-
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
5251
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/>
5352
<waitForElementVisible time="30" selector="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" stepKey="waitForContentTypeInPanel"/>
5453
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,12 +633,14 @@
633633
<after>
634634
<actionGroup ref="logout" stepKey="logout"/>
635635
</after>
636+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
636637
<actionGroup ref="dragContentTypeToContainer" stepKey="dragFirstTwoColumns">
637638
<argument name="contentType" value="PageBuilderColumnContentType"/>
638639
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
639640
<argument name="containerTargetIndex" value="1"/>
640641
<argument name="contentTypeIndex" value="1"/>
641642
</actionGroup>
643+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop2"/>
642644
<actionGroup ref="dragContentTypeToContainer" stepKey="dragThirdColumn">
643645
<argument name="contentType" value="PageBuilderColumnContentType"/>
644646
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,12 +457,13 @@
457457
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
458458
<argument name="group" value="PageBuilderHeadingContentType"/>
459459
</actionGroup>
460+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
460461
<actionGroup ref="dragContentTypeToContainer" stepKey="dragContentTypeToStage2">
461462
<argument name="contentType" value="PageBuilderHeadingContentType"/>
462463
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
463464
<argument name="containerTargetIndex" value="2"/>
464465
</actionGroup>
465-
<scrollTo selector="div.pagebuilder-header" x="0" y="-100" stepKey="scrollToTop"/>
466+
<scrollTo selector="div.pagebuilder-header" x="0" y="-100" stepKey="scrollToTop2"/>
466467
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading">
467468
<argument name="index" value="1"/>
468469
</actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@
306306
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
307307
<argument name="group" value="PageBuilderHeadingContentType"/>
308308
</actionGroup>
309+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
309310
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToFirstRow">
310311
<argument name="contentType" value="PageBuilderHeadingContentType"/>
311312
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -328,13 +329,14 @@
328329
<argument name="property" value="PageBuilderVerticalAlignmentPropertyCenter"/>
329330
</actionGroup>
330331
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsSecondRow"/>
332+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop2"/>
331333
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToSecondRow">
332334
<argument name="contentType" value="PageBuilderHeadingContentType"/>
333335
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
334336
<argument name="containerTargetIndex" value="2"/>
335337
<argument name="contentTypeIndex" value="1"/>
336338
</actionGroup>
337-
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
339+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop3"/>
338340
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading2">
339341
<argument name="index" value="2"/>
340342
</actionGroup>
@@ -351,7 +353,7 @@
351353
<argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>
352354
</actionGroup>
353355
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsThirdColumn"/>
354-
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop2"/>
356+
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop4"/>
355357
<actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingToThirdRow">
356358
<argument name="contentType" value="PageBuilderHeadingContentType"/>
357359
<argument name="containerTargetType" value="PageBuilderRowContentType"/>

0 commit comments

Comments
 (0)