Skip to content

Commit 816beb1

Browse files
author
Michael Yu
committed
MC-3031: MFTF Test Updates
- Updated test case id to zephyr tests - Updated comment for validation stage after save - Updated ordering of test steps
1 parent f85d849 commit 816beb1

21 files changed

+65
-62
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,12 @@
4949
<actionGroup name="validateContentTypeNotInsideContainerStage">
5050
<arguments>
5151
<argument name="contentType"/>
52+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
5253
<argument name="containerTargetType"/>
5354
<argument name="containerTargetIndex" defaultValue="1" type="string"/>
55+
<argument name="positionInContainer" defaultValue="1" type="string"/>
5456
</arguments>
55-
<waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeNotInsideContainerStage(containerTargetType.role, containerTargetIndex, contentType.role)}}" stepKey="waitForContentTypeStage"/>
57+
<waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(containerTargetType.role, containerTargetIndex)}}" stepKey="waitForContentTypeStage"/>
58+
<dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentType.role, contentTypeIndex)}}" stepKey="dontSeeContentTypeInContainer"/>
5659
</actionGroup>
5760
</actionGroups>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<element name="contentTypeInStageByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]' parameterized="true"/>
2828
<element name="contentTypeContainer" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]/descendant::div[contains(@class, "element-children")]' parameterized="true"/>
2929
<element name="contentTypeInsideContainerStage" type="button" selector='(//div[contains(@class, "{{arg1}}-container")])[{{arg2}}]//div[contains(@class,"pagebuilder-content-type-wrapper")][{{arg3}}]//div[contains(@class,"pagebuilder-{{arg4}}")][{{arg5}}]' parameterized="true"/>
30-
<element name="contentTypeNotInsideContainerStage" type="button" selector='(//div[contains(@class, "{{arg1}}-container")])[{{arg2}}][not(.//div[contains(@class, "pagebuilder-{{arg3}}")])]' parameterized="true"/>
3130
<element name="contentTypePreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type" parameterized="true"/>
3231
<element name="computedHeightOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelector('.pagebuilder-{{arg1}}:nth-of-type({{arg2}})')).height)" parameterized="true"/>
3332
<element name="computedWidthOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelector('.pagebuilder-{{arg1}}:nth-of-type({{arg2}})')).width)" parameterized="true"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<description value="If user drags Accordion to Stage, it should have no effect"/>
146146
<severity value="CRITICAL"/>
147147
<useCaseId value="MC-515"/>
148-
<testCaseId value="MC-3031"/>
148+
<testCaseId value="MC-3111"/>
149149
<group value="pagebuilder"/>
150150
<group value="pagebuilder-accordion"/>
151151
<group value="pagebuilder-cannotAddToStage"/>
@@ -175,7 +175,7 @@
175175
<description value="As a Content Manager I want column to be a container so that I can add Accordion inside"/>
176176
<severity value="CRITICAL"/>
177177
<useCaseId value="MC-515"/>
178-
<testCaseId value="MC-3031"/>
178+
<testCaseId value="MC-3112"/>
179179
<group value="pagebuilder"/>
180180
<group value="pagebuilder-column"/>
181181
<group value="pagebuilder-accordion"/>
@@ -214,9 +214,9 @@
214214
<argument name="containerTargetIndex" value="2"/>
215215
</actionGroup>
216216
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
217-
<!-- Validate Stage After Save -->
218-
<comment userInput="User sees Accordion displayed in column on Stage" stepKey="confirmAccordionOnStage2"/>
219217
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
218+
<!-- Validate Stage After Save -->
219+
<comment userInput="Validate stage after save" stepKey="validateAccordionOnStage"/>
220220
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
221221
<argument name="contentType" value="PageBuilderAccordionContentType"/>
222222
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@
783783
<description value="If user drags Anchor to Stage, it should have no effect"/>
784784
<severity value="CRITICAL"/>
785785
<useCaseId value="MC-515"/>
786-
<testCaseId value="MC-3031"/>
786+
<testCaseId value="MC-3113"/>
787787
<group value="pagebuilder"/>
788788
<group value="pagebuilder-anchor"/>
789789
<group value="pagebuilder-cannotAddToStage"/>
@@ -813,7 +813,7 @@
813813
<description value="As a Content Manager I want column to be a container so that I can add Anchor inside"/>
814814
<severity value="CRITICAL"/>
815815
<useCaseId value="MC-515"/>
816-
<testCaseId value="MC-3031"/>
816+
<testCaseId value="MC-3114"/>
817817
<group value="pagebuilder"/>
818818
<group value="pagebuilder-column"/>
819819
<group value="pagebuilder-anchor"/>
@@ -852,9 +852,9 @@
852852
<argument name="containerTargetIndex" value="2"/>
853853
</actionGroup>
854854
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
855-
<!-- Validate Stage After Save -->
856-
<comment userInput="User sees Anchor displayed in column on Stage" stepKey="confirmAnchorOnStage2"/>
857855
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
856+
<!-- Validate Stage After Save -->
857+
<comment userInput="Validate stage after save" stepKey="validateAnchorOnStage"/>
858858
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
859859
<argument name="contentType" value="PageBuilderAnchorContentType"/>
860860
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,7 +1339,7 @@
13391339
<description value="If user drags Banner to Stage, it should have no effect"/>
13401340
<severity value="CRITICAL"/>
13411341
<useCaseId value="MC-515"/>
1342-
<testCaseId value="MC-3031"/>
1342+
<testCaseId value="MC-3115"/>
13431343
<group value="pagebuilder"/>
13441344
<group value="pagebuilder-banner"/>
13451345
<group value="pagebuilder-cannotAddToStage"/>
@@ -1369,7 +1369,7 @@
13691369
<description value="As a Content Manager I want column to be a container so that I can add Banner inside"/>
13701370
<severity value="CRITICAL"/>
13711371
<useCaseId value="MC-515"/>
1372-
<testCaseId value="MC-3031"/>
1372+
<testCaseId value="MC-3116"/>
13731373
<group value="pagebuilder"/>
13741374
<group value="pagebuilder-column"/>
13751375
<group value="pagebuilder-banner"/>
@@ -1408,9 +1408,9 @@
14081408
<argument name="containerTargetIndex" value="2"/>
14091409
</actionGroup>
14101410
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1411-
<!-- Validate Stage After Save -->
1412-
<comment userInput="User sees Banner displayed in column on Stage" stepKey="confirmBannerOnStage2"/>
14131411
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1412+
<!-- Validate Stage After Save -->
1413+
<comment userInput="Validate stage after save" stepKey="validateBannerOnStage"/>
14141414
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
14151415
<argument name="contentType" value="PageBuilderBannerContentType"/>
14161416
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@
418418
<description value="If user drags Block to Stage, it should have no effect"/>
419419
<severity value="CRITICAL"/>
420420
<useCaseId value="MC-515"/>
421-
<testCaseId value="MC-3031"/>
421+
<testCaseId value="MC-3117"/>
422422
<group value="pagebuilder"/>
423423
<group value="pagebuilder-block"/>
424424
<group value="pagebuilder-cannotAddToStage"/>
@@ -448,7 +448,7 @@
448448
<description value="As a Content Manager I want column to be a container so that I can add Block inside"/>
449449
<severity value="CRITICAL"/>
450450
<useCaseId value="MC-515"/>
451-
<testCaseId value="MC-3031"/>
451+
<testCaseId value="MC-3118"/>
452452
<group value="pagebuilder"/>
453453
<group value="pagebuilder-column"/>
454454
<group value="pagebuilder-block"/>
@@ -487,9 +487,9 @@
487487
<argument name="containerTargetIndex" value="2"/>
488488
</actionGroup>
489489
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
490-
<!-- Validate Stage After Save -->
491-
<comment userInput="User sees Block displayed in column on Stage" stepKey="confirmBlockOnStage2"/>
492490
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
491+
<!-- Validate Stage After Save -->
492+
<comment userInput="Validate stage after save" stepKey="validateBlockOnStage"/>
493493
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
494494
<argument name="contentType" value="PageBuilderBlockContentType"/>
495495
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1451,7 +1451,7 @@
14511451
<description value="If user drags Buttons to Stage, it should have no effect"/>
14521452
<severity value="CRITICAL"/>
14531453
<useCaseId value="MC-515"/>
1454-
<testCaseId value="MC-3031"/>
1454+
<testCaseId value="MC-3119"/>
14551455
<group value="pagebuilder"/>
14561456
<group value="pagebuilder-button"/>
14571457
<group value="pagebuilder-buttonGroup"/>
@@ -1482,7 +1482,7 @@
14821482
<description value="As a Content Manager I want column to be a container so that I can add Buttons inside"/>
14831483
<severity value="CRITICAL"/>
14841484
<useCaseId value="MC-515"/>
1485-
<testCaseId value="MC-3031"/>
1485+
<testCaseId value="MC-3120"/>
14861486
<group value="pagebuilder"/>
14871487
<group value="pagebuilder-column"/>
14881488
<group value="pagebuilder-button"/>
@@ -1522,9 +1522,9 @@
15221522
<argument name="containerTargetIndex" value="2"/>
15231523
</actionGroup>
15241524
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1525-
<!-- Validate Stage After Save -->
1526-
<comment userInput="User sees Buttons displayed in column on Stage" stepKey="confirmButtonsOnStage2"/>
15271525
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
1526+
<!-- Validate Stage After Save -->
1527+
<comment userInput="Validate stage after save" stepKey="validateButtonsOnStage"/>
15281528
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
15291529
<argument name="contentType" value="PageBuilderButtonsContentType"/>
15301530
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1564,7 +1564,7 @@
15641564
<description value="If user drags Column to Stage, it should have no effect"/>
15651565
<severity value="CRITICAL"/>
15661566
<useCaseId value="MC-515"/>
1567-
<testCaseId value="MC-3031"/>
1567+
<testCaseId value="MC-3142"/>
15681568
<group value="pagebuilder"/>
15691569
<group value="pagebuilder-column"/>
15701570
<group value="pagebuilder-columnGeneral"/>
@@ -1596,7 +1596,7 @@
15961596
<description value="If user drags column into a column, it should have no effect"/>
15971597
<severity value="CRITICAL"/>
15981598
<useCaseId value="MC-515"/>
1599-
<testCaseId value="MC-3031"/>
1599+
<testCaseId value="MC-3143"/>
16001600
<group value="pagebuilder"/>
16011601
<group value="pagebuilder-column"/>
16021602
<group value="pagebuilder-columnGeneral"/>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@
772772
<description value="If user drags Divider to Stage, it should have no effect"/>
773773
<severity value="CRITICAL"/>
774774
<useCaseId value="MC-515"/>
775-
<testCaseId value="MC-3031"/>
775+
<testCaseId value="MC-3122"/>
776776
<group value="pagebuilder"/>
777777
<group value="pagebuilder-divider"/>
778778
<group value="pagebuilder-cannotAddToStage"/>
@@ -802,7 +802,7 @@
802802
<description value="As a Content Manager I want column to be a container so that I can add Divider inside"/>
803803
<severity value="CRITICAL"/>
804804
<useCaseId value="MC-515"/>
805-
<testCaseId value="MC-3031"/>
805+
<testCaseId value="MC-3121"/>
806806
<group value="pagebuilder"/>
807807
<group value="pagebuilder-column"/>
808808
<group value="pagebuilder-divider"/>
@@ -841,9 +841,9 @@
841841
<argument name="containerTargetIndex" value="2"/>
842842
</actionGroup>
843843
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
844-
<!-- Validate Stage After Save -->
845-
<comment userInput="User sees Divider displayed in column on Stage" stepKey="confirmDividerOnStage2"/>
846844
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
845+
<!-- Validate Stage After Save -->
846+
<comment userInput="Validate stage after save" stepKey="validateDividerOnStage"/>
847847
<actionGroup ref="validateContentTypeInsideContainerStage" stepKey="checkContentTypeInContainerStage2">
848848
<argument name="contentType" value="PageBuilderDividerContentType"/>
849849
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1087,7 +1087,7 @@
10871087
<description value="If user drags Heading to Stage, it should have no effect"/>
10881088
<severity value="CRITICAL"/>
10891089
<useCaseId value="MC-515"/>
1090-
<testCaseId value="MC-3031"/>
1090+
<testCaseId value="MC-3144"/>
10911091
<group value="pagebuilder"/>
10921092
<group value="pagebuilder-heading"/>
10931093
<group value="pagebuilder-cannotAddToStage"/>

0 commit comments

Comments
 (0)