Skip to content

Commit 73e9d4b

Browse files
dhaeckerdhaecker
committed
Merge branch 'MC-5684' into cms-team-1-delivery
2 parents 696f853 + 13c014c commit 73e9d4b

11 files changed

+15
-23
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,21 @@
8383
<arguments>
8484
<argument name="contentType"/>
8585
<argument name="targetIndex" defaultValue="1" type="string"/>
86-
<argument name="expectedIndex" defaultValue="2" type="string"/>
8786
<argument name="contentTypeXCoordinate" defaultValue="null" type="string"/>
8887
<argument name="contentTypeYCoordinate" defaultValue="null" type="string"/>
8988
</arguments>
89+
<waitForElement selector="{{PageBuilderStage.contentTypeTotalInStage(contentType.role)}}" stepKey="waitForAllContentTypes"/>
90+
<executeJS function="return document.querySelectorAll('{{PageBuilderStage.contentTypeTotalInStage(contentType.role)}}').length+1" stepKey="expectedContentTypeCount"/>
9091
<waitForElementVisible selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, targetIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
9192
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, targetIndex)}}" x="{{contentTypeXCoordinate}}" y="{{contentTypeYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
9293
<waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex(contentType.role, targetIndex)}}" stepKey="waitForOptionsMenu"/>
9394
<click selector="{{PageBuilderContentTypeOptionsMenu.contentTypeDuplicate(contentType.role, targetIndex)}}" stepKey="clickDuplicateContentType"/>
9495
<waitForPageLoad time="30" stepKey="waitForAnimation"/>
95-
<waitForElementVisible selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, expectedIndex)}}" stepKey="waitForDuplicateContentType"/>
96+
<executeJS function="return document.querySelectorAll('{{PageBuilderStage.contentTypeTotalInStage(contentType.role)}}').length" stepKey="resultingContentTypeCount"/>
97+
<assertEquals stepKey="assertContentTypeCount">
98+
<actualResult type="variable">$resultingContentTypeCount</actualResult>
99+
<expectedResult type="variable">$expectedContentTypeCount</expectedResult>
100+
</assertEquals>
96101
</actionGroup>
97102
<actionGroup name="duplicateSmallContentType">
98103
<arguments>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<element name="errorModal" type="button" selector="//div[@class='modal-content']//div[contains(text(), '{{arg1}}')]" parameterized="true"/>
2828
<element name="dropAreaInStage" type="button" selector='(//div[contains(@class, "type-container") and contains(@class, "pagebuilder-row")])[1]//div[contains(@class,"pagebuilder-empty-container")][1]'/>
2929
<element name="dropZone" type="button" selector='(//div[contains(@class, "{{arg1}}-container")])[{{arg2}}]//div[contains(@class,"pagebuilder-drop-indicator")][{{arg3}}]' parameterized="true"/>
30+
<element name="contentTypeTotalInStage" type="button" selector=".pagebuilder-content-type.pagebuilder-{{arg1}}" parameterized="true"/>
3031
<element name="contentTypeInStage" type="button" selector='//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")]' parameterized="true"/>
3132
<element name="contentTypeInStageByIndex" type="button" selector='(//div[contains(@class, "pagebuilder-content-type") and contains(@class, "pagebuilder-{{arg1}}")])[{{arg2}}]' parameterized="true"/>
3233
<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"/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2222,7 +2222,6 @@
22222222
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
22232223
<argument name="contentType" value="PageBuilderColumnContentType"/>
22242224
<argument name="targetIndex" value="1"/>
2225-
<argument name="expectedIndex" value="2"/>
22262225
<argument name="contentTypeXCoordinate" value="10"/>
22272226
<argument name="contentTypeYCoordinate" value="0"/>
22282227
</actionGroup>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,6 @@
492492
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
493493
<argument name="contentType" value="PageBuilderColumnContentType"/>
494494
<argument name="targetIndex" value="1"/>
495-
<argument name="expectedIndex" value="3"/>
496495
<argument name="contentTypeXCoordinate" value="10"/>
497496
<argument name="contentTypeYCoordinate" value="0"/>
498497
</actionGroup>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,7 +1352,6 @@
13521352
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
13531353
<argument name="contentType" value="PageBuilderColumnContentType"/>
13541354
<argument name="targetIndex" value="1"/>
1355-
<argument name="expectedIndex" value="2"/>
13561355
<argument name="contentTypeXCoordinate" value="10"/>
13571356
<argument name="contentTypeYCoordinate" value="0"/>
13581357
</actionGroup>
@@ -1559,7 +1558,6 @@
15591558
<actionGroup ref="duplicateContentType" after="duplicateColumn" stepKey="duplicateColumnAgain">
15601559
<argument name="contentType" value="PageBuilderColumnContentType"/>
15611560
<argument name="targetIndex" value="1"/>
1562-
<argument name="expectedIndex" value="4"/>
15631561
<argument name="contentTypeXCoordinate" value="10"/>
15641562
<argument name="contentTypeYCoordinate" value="0"/>
15651563
</actionGroup>

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -460,12 +460,10 @@
460460
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
461461
<argument name="contentType" value="PageBuilderColumnContentType"/>
462462
<argument name="targetIndex" value="1"/>
463-
<argument name="expectedIndex" value="2"/>
464463
</actionGroup>
465464
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn2">
466465
<argument name="contentType" value="PageBuilderColumnContentType"/>
467466
<argument name="targetIndex" value="1"/>
468-
<argument name="expectedIndex" value="2"/>
469467
</actionGroup>
470468
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="4" stepKey="seeNumberOfColumns4"/>
471469
<actionGroup ref="updateGridSize" stepKey="updateGridSizeTo1">
@@ -500,7 +498,6 @@
500498
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
501499
<argument name="contentType" value="PageBuilderColumnContentType"/>
502500
<argument name="targetIndex" value="1"/>
503-
<argument name="expectedIndex" value="2"/>
504501
</actionGroup>
505502
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="3" stepKey="seeNumberOfColumns3"/>
506503
<actionGroup ref="updateGridSize" stepKey="updateGridSizeTo7">
@@ -619,7 +616,6 @@
619616
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
620617
<argument name="contentType" value="PageBuilderColumnContentType"/>
621618
<argument name="targetIndex" value="1"/>
622-
<argument name="expectedIndex" value="2"/>
623619
</actionGroup>
624620
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="3" stepKey="seeNumberOfColumns3"/>
625621
<seeElement selector="{{ColumnOnBackend.displayLabel('1','1/3')}}" stepKey="checkWidthFirstColumn"/>
@@ -654,14 +650,15 @@
654650
<argument name="gridSize" value="2"/>
655651
</actionGroup>
656652
<actionGroup ref="closeGridSizeForm" stepKey="closeGridSizeForm"/>
657-
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
658-
<argument name="contentType" value="PageBuilderColumnContentType"/>
659-
<argument name="targetIndex" value="1"/>
660-
<argument name="expectedIndex" value="2"/>
661-
</actionGroup>
662-
<waitForElementVisible selector="{{PageBuilderStage.modalOk}}" stepKey="seeCannotDuplicateColumnModal"/>
653+
<waitForElementVisible selector="{{PageBuilderStage.contentTypeInStageByIndex(PageBuilderColumnContentType.role, '1')}}" stepKey="waitForColumn1Visible"/>
654+
<moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(PageBuilderColumnContentType.role, '1')}}" stepKey="mouseOverColumn1"/>
655+
<waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex(PageBuilderColumnContentType.role, '1')}}" stepKey="waitForOptionsMenu"/>
656+
<click selector="{{PageBuilderContentTypeOptionsMenu.contentTypeDuplicate(PageBuilderColumnContentType.role, '1')}}" stepKey="clickDuplicate"/>
657+
<waitForPageLoad stepKey="waitForPageLoad"/>
658+
<waitForElementVisible selector="{{PageBuilderStage.modalOk}}" stepKey="waitForCannotDuplicateColumnModal"/>
663659
<seeElement selector="{{PageBuilderStage.errorModal(PageBuilderColumnDuplicate.cannotDuplicateColumnErrorMessage)}}" stepKey="seeErrorMessage"/>
664660
<click selector="{{PageBuilderStage.modalOk}}" stepKey="closeModal"/>
661+
<waitForPageLoad stepKey="waitForPageLoad2"/>
665662
<seeNumberOfElements selector="{{ColumnOnBackend.allColumns}}" userInput="2" stepKey="seeNumberOfColumns2"/>
666663
</test>
667664
<test name="ValidateMaxColumnError">

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,6 @@
763763
<actionGroup ref="duplicateContentType" stepKey="duplicateFirstColumn">
764764
<argument name="contentType" value="PageBuilderColumnContentType"/>
765765
<argument name="targetIndex" value="1"/>
766-
<argument name="expectedIndex" value="4"/>
767766
</actionGroup>
768767
<actionGroup ref="removeContentTypeFromStageByIndex" stepKey="removeFirstColumn">
769768
<argument name="contentType" value="PageBuilderColumnContentType"/>
@@ -872,7 +871,6 @@
872871
<actionGroup ref="duplicateContentType" stepKey="duplicateFirstColumn">
873872
<argument name="contentType" value="PageBuilderColumnContentType"/>
874873
<argument name="targetIndex" value="1"/>
875-
<argument name="expectedIndex" value="3"/>
876874
</actionGroup>
877875
<!-- Resizing columns to create 5/12, 1/12, 6/12 configuration, logic for resizing differs when dragging a 1/2 column to the left -->
878876
<comment userInput="Resizing columns to create 5/12, 1/12, 6/12 configuration, logic for resizing differs when dragging a 1/2 column to the left" stepKey="commentInitialResize"/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1386,7 +1386,6 @@
13861386
<actionGroup ref="duplicateContentType" stepKey="duplicateSecondColumn">
13871387
<argument name="contentType" value="PageBuilderColumnContentType"/>
13881388
<argument name="targetIndex" value="2"/>
1389-
<argument name="expectedIndex" value="3"/>
13901389
</actionGroup>
13911390
<!-- Assert original 1st and 3rd column are unaffected -->
13921391
<comment userInput="Assert duplication was successful" stepKey="commentAssertDuplicateSuccess"/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,6 @@
12501250
<argument name="contentType" value="PageBuilderColumnContentType"/>
12511251
<argument name="contentTypeXCoordinate" value="5"/>
12521252
<argument name="contentTypeYCoordinate" value="5"/>
1253-
<argument name="expectedIndex" value="3"/>
12541253
</actionGroup>
12551254
<!-- Validate content type is duplicated -->
12561255
<comment userInput="Validate content type is duplicated" stepKey="commentValidateDuplicateOnStage"/>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1613,7 +1613,6 @@
16131613
<actionGroup ref="duplicateContentType" stepKey="duplicateColumn">
16141614
<argument name="contentType" value="PageBuilderColumnContentType"/>
16151615
<argument name="targetIndex" value="1"/>
1616-
<argument name="expectedIndex" value="2"/>
16171616
<argument name="contentTypeXCoordinate" value="10"/>
16181617
<argument name="contentTypeYCoordinate" value="0"/>
16191618
</actionGroup>

0 commit comments

Comments
 (0)