Skip to content

Commit 859e544

Browse files
anthoulaanthoula
committed
MC-3167: Update MFTF Tests
- expand panel to access text content type for various tests
1 parent 195d77f commit 859e544

8 files changed

+54
-9
lines changed

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

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,9 @@
862862
</actionGroup>
863863
<!-- Add Border Color: Empty -->
864864
<comment userInput="Add Border Color: Empty" stepKey="commentAddBorderColorEmpty"/>
865+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
866+
<argument name="group" value="PageBuilderTextContentType"/>
867+
</actionGroup>
865868
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
866869
<argument name="contentType" value="PageBuilderTextContentType"/>
867870
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -908,9 +911,6 @@
908911
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
909912
<!-- Add Border Color: #FF0000 -->
910913
<comment userInput="Add Border Color: Hex #FF0000" stepKey="commentAddBorderColorHex"/>
911-
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
912-
<argument name="group" value="PageBuilderTextContentType"/>
913-
</actionGroup>
914914
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage3">
915915
<argument name="contentType" value="PageBuilderTextContentType"/>
916916
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1126,6 +1126,9 @@
11261126
</actionGroup>
11271127
<!-- Add Border Width: Empty -->
11281128
<comment userInput="Add Border Width: Empty" stepKey="commentAddBorderWidthEmpty"/>
1129+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1130+
<argument name="group" value="PageBuilderTextContentType"/>
1131+
</actionGroup>
11291132
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
11301133
<argument name="contentType" value="PageBuilderTextContentType"/>
11311134
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1399,6 +1402,9 @@
13991402
</actionGroup>
14001403
<!-- Add Border Radius: Empty -->
14011404
<comment userInput="Add Border Radius: Empty" stepKey="commentAddBorderRadiusEmpty"/>
1405+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1406+
<argument name="group" value="PageBuilderTextContentType"/>
1407+
</actionGroup>
14021408
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
14031409
<argument name="contentType" value="PageBuilderTextContentType"/>
14041410
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1636,6 +1642,9 @@
16361642
</actionGroup>
16371643
<!-- Add CSS Classes: Empty -->
16381644
<comment userInput="Add CSS Classes: Empty" stepKey="commentAddCSSClassesEmpty"/>
1645+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1646+
<argument name="group" value="PageBuilderTextContentType"/>
1647+
</actionGroup>
16391648
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
16401649
<argument name="contentType" value="PageBuilderTextContentType"/>
16411650
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -1823,6 +1832,9 @@
18231832
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
18241833
<!-- Add Margins: 0 -->
18251834
<comment userInput="Add Margins: 0" stepKey="commentAddMargins0"/>
1835+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1836+
<argument name="group" value="PageBuilderTextContentType"/>
1837+
</actionGroup>
18261838
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage2">
18271839
<argument name="contentType" value="PageBuilderTextContentType"/>
18281840
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -2090,6 +2102,9 @@
20902102
</actionGroup>
20912103
<!-- Add Padding: Empty -->
20922104
<comment userInput="Add Padding: Empty" stepKey="commentAddPaddingEmpty"/>
2105+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2106+
<argument name="group" value="PageBuilderTextContentType"/>
2107+
</actionGroup>
20932108
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage1">
20942109
<argument name="contentType" value="PageBuilderTextContentType"/>
20952110
<argument name="containerTargetType" value="PageBuilderRowContentType"/>
@@ -2360,6 +2375,9 @@
23602375
</actionGroup>
23612376
<!-- Add Text To Stage -->
23622377
<comment userInput="Add Text To Stage" stepKey="commentAddText"/>
2378+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
2379+
<argument name="group" value="PageBuilderTextContentType"/>
2380+
</actionGroup>
23632381
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
23642382
<argument name="contentType" value="PageBuilderTextContentType"/>
23652383
<argument name="containerTargetType" value="PageBuilderRowContentType"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,10 @@
13721372
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpgCopy.fileName)}}" stepKey="seeMainImageSource3"/>
13731373
<seeElement selector="{{ImageOnConfigurationPanel.trashBinIcon}}" stepKey="seeTrashBinBtn"/>
13741374
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
1375-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
1375+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
1376+
<argument name="group" value="PageBuilderTextContentType"/>
1377+
</actionGroup>
1378+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
13761379
<argument name="contentType" value="PageBuilderTextContentType"/>
13771380
</actionGroup>
13781381
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">

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

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@
9494
<!--See PageBuilder fullsize-->
9595
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible" />
9696
<seeElement selector="{{PageBuilderStage.stageWrapperFullScreen}}" stepKey="seePageBuilderFullSizeScreen" />
97-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
97+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
98+
<argument name="group" value="PageBuilderTextContentType"/>
99+
</actionGroup>
100+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
98101
<argument name="contentType" value="PageBuilderTextContentType"/>
99102
</actionGroup>
100103
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
@@ -142,7 +145,10 @@
142145
<argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
143146
</actionGroup>
144147
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="waitForPageBuilderDisplay" />
145-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
148+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
149+
<argument name="group" value="PageBuilderTextContentType"/>
150+
</actionGroup>
151+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
146152
<argument name="contentType" value="PageBuilderTextContentType"/>
147153
</actionGroup>
148154
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
@@ -187,7 +193,10 @@
187193
<actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage1">
188194
<argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
189195
</actionGroup>
190-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
196+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
197+
<argument name="group" value="PageBuilderTextContentType"/>
198+
</actionGroup>
199+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
191200
<argument name="contentType" value="PageBuilderTextContentType"/>
192201
</actionGroup>
193202
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,10 @@
316316
<waitForElementVisible selector="{{PageBuilderPanel.layoutGroup}}" stepKey="waiForPageBuilderVisible" />
317317
<seeElement selector="{{PageBuilderPanel.layoutGroup}}" stepKey="seePageBuilderVisible" />
318318
<seeElement selector=".stage-full-screen" stepKey="seePageBuilderFullSizeScreen" />
319-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
319+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
320+
<argument name="group" value="PageBuilderTextContentType"/>
321+
</actionGroup>
322+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
320323
<argument name="contentType" value="PageBuilderTextContentType"/>
321324
</actionGroup>
322325
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,10 @@
730730
<seeElement selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImagePropertyJpgCopy.fileName)}}" stepKey="seeMainImageSource3"/>
731731
<seeElement selector="{{ImageOnConfigurationPanel.trashBinIcon}}" stepKey="seeTrashBinBtn"/>
732732
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
733-
<actionGroup ref="dragContentTypeToStage" stepKey="dragButtonsOntoStage">
733+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupElements">
734+
<argument name="group" value="PageBuilderTextContentType"/>
735+
</actionGroup>
736+
<actionGroup ref="dragContentTypeToStage" stepKey="dragTextOntoStage">
734737
<argument name="contentType" value="PageBuilderTextContentType"/>
735738
</actionGroup>
736739
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,6 +1360,9 @@
13601360
<argument name="contentType" value="PageBuilderSliderContentType"/>
13611361
</actionGroup>
13621362
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
1363+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupElements">
1364+
<argument name="group" value="PageBuilderTextContentType"/>
1365+
</actionGroup>
13631366
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragTextIntoRowAboveSlider">
13641367
<argument name="contentType" value="PageBuilderTextContentType"/>
13651368
<argument name="containerTargetType" value="PageBuilderRowContentType"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,9 @@
540540
<actionGroup ref="dragContentTypeToStage" stepKey="dragTabsIntoStage">
541541
<argument name="contentType" value="PageBuilderTabsContentType"/>
542542
</actionGroup>
543+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupElements">
544+
<argument name="group" value="PageBuilderTextContentType"/>
545+
</actionGroup>
543546
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextOntoTab">
544547
<argument name="contentType" value="PageBuilderTextContentType"/>
545548
<argument name="containerTargetType" value="PageBuilderTabContentType"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
<waitForElementVisible selector="{{TabOnStage.tabContent('1')}}" stepKey="waitForFirstTabContent"/>
4646
<waitForElementVisible selector="{{TabOnStage.tabHeader('1')}}" stepKey="waitForFirstTabHeader"/>
4747
<!-- Add Text to Tab -->
48+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupElements">
49+
<argument name="group" value="PageBuilderTextContentType"/>
50+
</actionGroup>
4851
<actionGroup ref="dragContentTypeToContainer" stepKey="dragTextOntoTab">
4952
<argument name="contentType" value="PageBuilderTextContentType"/>
5053
<argument name="containerTargetType" value="PageBuilderTabContentType"/>

0 commit comments

Comments
 (0)