Skip to content

Commit 027e21b

Browse files
author
Michael Yu
committed
MC-3031: MFTF Test Updates
- Updated stepKey names - Added post save stage validation - Added action group to expand panel group - Added comments for adding content type
1 parent d0f462d commit 027e21b

22 files changed

+228
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
110110
</arguments>
111111
<scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
112-
<waitForElement time="30" selector="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" stepKey="waitForStageActive"/>
113-
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>
112+
<waitForElement time="30" selector="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" stepKey="waitForTargetActive"/>
113+
<dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropZone(containerTargetType.role, containerTargetIndex, dropZoneIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dragContentTypeIntoTarget"/>
114114
<waitForPageLoad time="30" stepKey="waitForAnimation"/>
115115
<dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="dontSeeElement"/>
116116
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAccordionTest.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<group value="pagebuilder"/>
2121
<group value="pagebuilder-accordion"/>
2222
</annotations>
23-
<before>
23+
<before>a
2424
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2525
<actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
2626
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -158,6 +158,9 @@
158158
<after>
159159
<actionGroup ref="logout" stepKey="logout"/>
160160
</after>
161+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
162+
<argument name="group" value="PageBuilderAccordionContentType"/>
163+
</actionGroup>
161164
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragAccordionIntoStage">
162165
<argument name="contentType" value="PageBuilderAccordionContentType"/>
163166
<argument name="containerTargetType" value="PageBuilderStage"/>
@@ -193,6 +196,7 @@
193196
<argument name="contentType" value="PageBuilderColumnContentType"/>
194197
</actionGroup>
195198
<!-- Add Accordion to Stage -->
199+
<comment userInput="Add Accordion to Stage" stepKey="addAccordionToStage"/>
196200
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
197201
<argument name="group" value="PageBuilderAccordionContentType"/>
198202
</actionGroup>
@@ -210,6 +214,15 @@
210214
<argument name="containerTargetIndex" value="2"/>
211215
</actionGroup>
212216
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
217+
<!-- Validate Stage After Save -->
218+
<comment userInput="User sees Accordion displayed in column on Stage" stepKey="confirmAccordionOnStage2"/>
219+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
220+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
221+
<argument name="contentType" value="PageBuilderAccordionContentType"/>
222+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
223+
<argument name="contentTypeIndex" value="1"/>
224+
<argument name="containerTargetIndex" value="2"/>
225+
</actionGroup>
213226
<!-- Validate Storefront -->
214227
<comment userInput="View Accordion inside column on storefront" stepKey="viewAccordionOnStorefront"/>
215228
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAnchorTest.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,9 @@
796796
<after>
797797
<actionGroup ref="logout" stepKey="logout"/>
798798
</after>
799+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
800+
<argument name="group" value="PageBuilderAnchorContentType"/>
801+
</actionGroup>
799802
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragAnchorIntoStage">
800803
<argument name="contentType" value="PageBuilderAnchorContentType"/>
801804
<argument name="containerTargetType" value="PageBuilderStage"/>
@@ -831,6 +834,7 @@
831834
<argument name="contentType" value="PageBuilderColumnContentType"/>
832835
</actionGroup>
833836
<!-- Add Anchor to Stage -->
837+
<comment userInput="Add Anchor to Stage" stepKey="addAnchorToStage"/>
834838
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
835839
<argument name="group" value="PageBuilderAnchorContentType"/>
836840
</actionGroup>
@@ -848,6 +852,15 @@
848852
<argument name="containerTargetIndex" value="2"/>
849853
</actionGroup>
850854
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
855+
<!-- Validate Stage After Save -->
856+
<comment userInput="User sees Anchor displayed in column on Stage" stepKey="confirmAnchorOnStage2"/>
857+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
858+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
859+
<argument name="contentType" value="PageBuilderAnchorContentType"/>
860+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
861+
<argument name="contentTypeIndex" value="1"/>
862+
<argument name="containerTargetIndex" value="2"/>
863+
</actionGroup>
851864
<!-- Validate Storefront -->
852865
<comment userInput="View Anchor inside column on storefront" stepKey="viewAnchorOnStorefront"/>
853866
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,9 @@
13521352
<after>
13531353
<actionGroup ref="logout" stepKey="logout"/>
13541354
</after>
1355+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
1356+
<argument name="group" value="PageBuilderBannerContentType"/>
1357+
</actionGroup>
13551358
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragBannerIntoStage">
13561359
<argument name="contentType" value="PageBuilderBannerContentType"/>
13571360
<argument name="containerTargetType" value="PageBuilderStage"/>
@@ -1387,6 +1390,7 @@
13871390
<argument name="contentType" value="PageBuilderColumnContentType"/>
13881391
</actionGroup>
13891392
<!-- Add Banner to Stage -->
1393+
<comment userInput="Add Banner to Stage" stepKey="addBannerToStage"/>
13901394
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
13911395
<argument name="group" value="PageBuilderBannerContentType"/>
13921396
</actionGroup>
@@ -1404,6 +1408,15 @@
14041408
<argument name="containerTargetIndex" value="2"/>
14051409
</actionGroup>
14061410
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1411+
<!-- Validate Stage After Save -->
1412+
<comment userInput="User sees Banner displayed in column on Stage" stepKey="confirmBannerOnStage2"/>
1413+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1414+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
1415+
<argument name="contentType" value="PageBuilderBannerContentType"/>
1416+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1417+
<argument name="contentTypeIndex" value="1"/>
1418+
<argument name="containerTargetIndex" value="2"/>
1419+
</actionGroup>
14071420
<!-- Validate Storefront -->
14081421
<comment userInput="View Banner inside column on storefront" stepKey="viewBannerOnStorefront"/>
14091422
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<after>
432432
<actionGroup ref="logout" stepKey="logout"/>
433433
</after>
434+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
435+
<argument name="group" value="PageBuilderBlockContentType"/>
436+
</actionGroup>
434437
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragBlockIntoStage">
435438
<argument name="contentType" value="PageBuilderBlockContentType"/>
436439
<argument name="containerTargetType" value="PageBuilderStage"/>
@@ -466,6 +469,7 @@
466469
<argument name="contentType" value="PageBuilderColumnContentType"/>
467470
</actionGroup>
468471
<!-- Add Block to Stage -->
472+
<comment userInput="Add Block to Stage" stepKey="addBlockToStage"/>
469473
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
470474
<argument name="group" value="PageBuilderBlockContentType"/>
471475
</actionGroup>
@@ -483,6 +487,15 @@
483487
<argument name="containerTargetIndex" value="2"/>
484488
</actionGroup>
485489
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
490+
<!-- Validate Stage After Save -->
491+
<comment userInput="User sees Block displayed in column on Stage" stepKey="confirmBlockOnStage2"/>
492+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
493+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
494+
<argument name="contentType" value="PageBuilderBlockContentType"/>
495+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
496+
<argument name="contentTypeIndex" value="1"/>
497+
<argument name="containerTargetIndex" value="2"/>
498+
</actionGroup>
486499
<!-- Validate Storefront -->
487500
<comment userInput="View Block inside column on storefront" stepKey="viewBlockOnStorefront"/>
488501
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTests.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,6 +1465,9 @@
14651465
<after>
14661466
<actionGroup ref="logout" stepKey="logout"/>
14671467
</after>
1468+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
1469+
<argument name="group" value="PageBuilderButtonsContentType"/>
1470+
</actionGroup>
14681471
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragButtonsIntoStage">
14691472
<argument name="contentType" value="PageBuilderButtonsContentType"/>
14701473
<argument name="containerTargetType" value="PageBuilderStage"/>
@@ -1501,6 +1504,7 @@
15011504
<argument name="contentType" value="PageBuilderColumnContentType"/>
15021505
</actionGroup>
15031506
<!-- Add Buttons to Stage -->
1507+
<comment userInput="Add Buttons to Stage" stepKey="addButtonsToStage"/>
15041508
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
15051509
<argument name="group" value="PageBuilderButtonsContentType"/>
15061510
</actionGroup>
@@ -1518,6 +1522,15 @@
15181522
<argument name="containerTargetIndex" value="2"/>
15191523
</actionGroup>
15201524
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1525+
<!-- Validate Stage After Save -->
1526+
<comment userInput="User sees Buttons displayed in column on Stage" stepKey="confirmButtonsOnStage2"/>
1527+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1528+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
1529+
<argument name="contentType" value="PageBuilderButtonsContentType"/>
1530+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
1531+
<argument name="contentTypeIndex" value="1"/>
1532+
<argument name="containerTargetIndex" value="2"/>
1533+
</actionGroup>
15211534
<!-- Validate Storefront -->
15221535
<comment userInput="View Buttons inside column on storefront" stepKey="viewButtonsOnStorefront"/>
15231536
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
<argument name="contentType" value="PageBuilderColumnContentType"/>
223223
</actionGroup>
224224
<!-- Add Tabs to Stage -->
225+
<comment userInput="Add Tabs to Stage" stepKey="addTabsToStage"/>
225226
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
226227
<argument name="group" value="PageBuilderMapContentType"/>
227228
</actionGroup>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,7 @@
14341434
<argument name="contentType" value="PageBuilderVideoContentType"/>
14351435
</actionGroup>
14361436
<!-- Add Column to Stage -->
1437+
<comment userInput="Add Column to Stage" stepKey="addColumnToStage"/>
14371438
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
14381439
<argument name="contentType" value="PageBuilderColumnContentType"/>
14391440
</actionGroup>
@@ -1577,6 +1578,9 @@
15771578
<after>
15781579
<actionGroup ref="logout" stepKey="logout"/>
15791580
</after>
1581+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
1582+
<argument name="group" value="PageBuilderColumnContentType"/>
1583+
</actionGroup>
15801584
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragColumnIntoStage">
15811585
<argument name="contentType" value="PageBuilderColumnContentType"/>
15821586
<argument name="containerTargetType" value="PageBuilderStage"/>
@@ -1607,6 +1611,9 @@
16071611
<actionGroup ref="logout" stepKey="logout"/>
16081612
</after>
16091613
<waitForElementVisible selector="{{PageBuilderPanel.draggableContentTypeInPanel(PageBuilderRowContentType.name)}}" stepKey="waitForRowToBeVisible"/>
1614+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
1615+
<argument name="group" value="PageBuilderColumnContentType"/>
1616+
</actionGroup>
16101617
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
16111618
<argument name="contentType" value="PageBuilderColumnContentType"/>
16121619
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,9 @@
785785
<after>
786786
<actionGroup ref="logout" stepKey="logout"/>
787787
</after>
788+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
789+
<argument name="group" value="PageBuilderDividerContentType"/>
790+
</actionGroup>
788791
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragDividerIntoStage">
789792
<argument name="contentType" value="PageBuilderDividerContentType"/>
790793
<argument name="containerTargetType" value="PageBuilderStage"/>
@@ -820,6 +823,7 @@
820823
<argument name="contentType" value="PageBuilderColumnContentType"/>
821824
</actionGroup>
822825
<!-- Add Divider to Stage -->
826+
<comment userInput="Add Divider to Stage" stepKey="addDividerToStage"/>
823827
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
824828
<argument name="group" value="PageBuilderDividerContentType"/>
825829
</actionGroup>
@@ -837,6 +841,15 @@
837841
<argument name="containerTargetIndex" value="2"/>
838842
</actionGroup>
839843
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
844+
<!-- Validate Stage After Save -->
845+
<comment userInput="User sees Divider displayed in column on Stage" stepKey="confirmDividerOnStage2"/>
846+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
847+
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
848+
<argument name="contentType" value="PageBuilderDividerContentType"/>
849+
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
850+
<argument name="contentTypeIndex" value="1"/>
851+
<argument name="containerTargetIndex" value="2"/>
852+
</actionGroup>
840853
<!-- Validate Storefront -->
841854
<comment userInput="View Divider inside column on storefront" stepKey="viewDividerOnStorefront"/>
842855
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,9 @@
11001100
<after>
11011101
<actionGroup ref="logout" stepKey="logout"/>
11021102
</after>
1103+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
1104+
<argument name="group" value="PageBuilderHeadingContentType"/>
1105+
</actionGroup>
11031106
<actionGroup ref="cannotDragContentTypeToTarget" stepKey="dragHeadingIntoStage">
11041107
<argument name="contentType" value="PageBuilderHeadingContentType"/>
11051108
<argument name="containerTargetType" value="PageBuilderStage"/>

0 commit comments

Comments
 (0)