Skip to content

Commit 5e2bca5

Browse files
committed
MC-3167: Update MFTF Tests
- expand panel to access divider content type for various tests
1 parent 887f07f commit 5e2bca5

File tree

4 files changed

+39
-0
lines changed

4 files changed

+39
-0
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,9 @@
261261
<waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2','3/6')}}" stepKey="validateRightColumnWidth"/>
262262
<!-- Drag divider into first column to clear history -->
263263
<comment userInput="Drag divider into first column to clear history" stepKey="commentAddDividerToColumn" />
264+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
265+
<argument name="group" value="PageBuilderDividerContentType"/>
266+
</actionGroup>
264267
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
265268
<argument name="contentType" value="PageBuilderDividerContentType"/>
266269
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -445,6 +448,9 @@
445448
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
446449
<argument name="contentType" value="PageBuilderColumnContentType"/>
447450
</actionGroup>
451+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
452+
<argument name="group" value="PageBuilderDividerContentType"/>
453+
</actionGroup>
448454
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
449455
<argument name="contentType" value="PageBuilderDividerContentType"/>
450456
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
<!-- Assert the width class changed to 100 correctly on the first column -->
5050
<waitForElement selector="{{ColumnOnBackend.columnByIndexAndWidthClass('1','100')}}" stepKey="assertWidthClass1"/>
5151
<!-- Add a new column -->
52+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
53+
<argument name="group" value="PageBuilderDividerContentType"/>
54+
</actionGroup>
5255
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage">
5356
<argument name="contentType" value="PageBuilderDividerContentType"/>
5457
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -125,6 +128,9 @@
125128
<!-- Assert the width classes are correct after manual resize -->
126129
<waitForElement selector="{{ColumnOnBackend.columnByIndexAndWidthClass('1','90')}}" stepKey="assertWidthClass1"/>
127130
<waitForElement selector="{{ColumnOnBackend.columnByIndexAndWidthClass('2','20')}}" stepKey="assertWidthClass2"/>
131+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
132+
<argument name="group" value="PageBuilderDividerContentType"/>
133+
</actionGroup>
128134
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
129135
<argument name="contentType" value="PageBuilderDividerContentType"/>
130136
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -213,6 +219,9 @@
213219
<argument name="contentType" value="PageBuilderColumnContentType"/>
214220
<argument name="contentTypeNumber" value="1"/>
215221
</actionGroup>
222+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
223+
<argument name="group" value="PageBuilderDividerContentType"/>
224+
</actionGroup>
216225
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
217226
<argument name="contentType" value="PageBuilderDividerContentType"/>
218227
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -400,6 +409,9 @@
400409
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
401410
<argument name="contentType" value="PageBuilderColumnContentType"/>
402411
</actionGroup>
412+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
413+
<argument name="group" value="PageBuilderDividerContentType"/>
414+
</actionGroup>
403415
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
404416
<argument name="contentType" value="PageBuilderDividerContentType"/>
405417
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -599,6 +611,9 @@
599611
<argument name="containerTargetIndex" value="3"/>
600612
</actionGroup>
601613
<dragAndDrop selector1="{{ColumnOnBackend.columnX('3')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('10')}}" x="$guideWidth" stepKey="resizeSecondColumnToTwo"/>
614+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
615+
<argument name="group" value="PageBuilderDividerContentType"/>
616+
</actionGroup>
602617
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
603618
<argument name="contentType" value="PageBuilderDividerContentType"/>
604619
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
@@ -741,6 +756,9 @@
741756
<argument name="contentType" value="PageBuilderColumnContentType"/>
742757
<argument name="contentTypeNumber" value="1"/>
743758
</actionGroup>
759+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
760+
<argument name="group" value="PageBuilderDividerContentType"/>
761+
</actionGroup>
744762
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage1">
745763
<argument name="contentType" value="PageBuilderDividerContentType"/>
746764
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
3232
<argument name="contentType" value="PageBuilderDividerContentType"/>
3333
</actionGroup>
34+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
35+
<argument name="group" value="PageBuilderDividerContentType"/>
36+
</actionGroup>
3437
<actionGroup ref="dragContentTypeToStage" stepKey="dragDividerIntoStage">
3538
<argument name="contentType" value="PageBuilderDividerContentType"/>
3639
</actionGroup>
@@ -111,6 +114,9 @@
111114
<after>
112115
<actionGroup ref="logout" stepKey="logout"/>
113116
</after>
117+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
118+
<argument name="group" value="PageBuilderDividerContentType"/>
119+
</actionGroup>
114120
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToStage">
115121
<argument name="contentType" value="PageBuilderDividerContentType"/>
116122
</actionGroup>
@@ -515,6 +521,9 @@
515521
<actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
516522
<argument name="contentType" value="PageBuilderDividerContentType"/>
517523
</actionGroup>
524+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
525+
<argument name="group" value="PageBuilderDividerContentType"/>
526+
</actionGroup>
518527
<actionGroup ref="dragContentTypeToStage" stepKey="dragDividerIntoStage">
519528
<argument name="contentType" value="PageBuilderDividerContentType"/>
520529
</actionGroup>
@@ -730,6 +739,9 @@
730739
<after>
731740
<actionGroup ref="logout" stepKey="logout"/>
732741
</after>
742+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
743+
<argument name="group" value="PageBuilderDividerContentType"/>
744+
</actionGroup>
733745
<actionGroup ref="dragContentTypeToStage" stepKey="dragDividerIntoStage">
734746
<argument name="contentType" value="PageBuilderDividerContentType"/>
735747
</actionGroup>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,9 @@
827827
<waitForElementVisible selector="{{TabOnStage.tabContent('1')}}" stepKey="waitForFirstTabContent"/>
828828
<waitForElementVisible selector="{{TabOnStage.tabHeader('1')}}" stepKey="waitForFirstTabHeader"/>
829829
<!-- Add Divider to Tab -->
830+
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupElements">
831+
<argument name="group" value="PageBuilderDividerContentType"/>
832+
</actionGroup>
830833
<actionGroup ref="dragContentTypeToContainer" stepKey="dragDividerOntoTab">
831834
<argument name="contentType" value="PageBuilderDividerContentType"/>
832835
<argument name="containerTargetType" value="PageBuilderTabContentType"/>

0 commit comments

Comments
 (0)