Skip to content

Commit 416f833

Browse files
author
Hanna Hnida
committed
#557: #557 User access Row action panel with 2+ level nesting - Mftf tests fixes
1 parent f678e77 commit 416f833

File tree

4 files changed

+36
-4
lines changed

4 files changed

+36
-4
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,21 @@
4343
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnOntoStage">
4444
<argument name="contentType" value="PageBuilderColumnContentType"/>
4545
</actionGroup>
46-
<actionGroup ref="dragContentTypeToStage" stepKey="dragNewColumnToFirstColumn">
46+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragNewColumnToFirstColumn">
4747
<argument name="contentType" value="PageBuilderColumnContentType"/>
4848
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
4949
<argument name="containerTargetIndex" value="1"/>
50+
<argument name="contentTypeIndex" value="1"/>
51+
<argument name="offsetXCoordinate" value="25"/>
52+
<argument name="offsetYCoordinate" value="25"/>
5053
</actionGroup>
51-
<actionGroup ref="dragContentTypeToStage" stepKey="dragNewColumnToSecondColumn">
54+
<actionGroup ref="dragContentTypeToContainer" stepKey="dragNewColumnToSecondColumn">
5255
<argument name="contentType" value="PageBuilderColumnContentType"/>
5356
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
5457
<argument name="containerTargetIndex" value="2"/>
58+
<argument name="contentTypeIndex" value="1"/>
59+
<argument name="offsetXCoordinate" value="25"/>
60+
<argument name="offsetYCoordinate" value="25"/>
5561
</actionGroup>
5662
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
5763
<actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveCMSBlock"/>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,29 @@
5050
<argument name="contentType" value="PageBuilderTextContentType"/>
5151
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
5252
<argument name="containerTargetIndex" value="1"/>
53+
<argument name="offsetXCoordinate" value="25"/>
54+
<argument name="offsetYCoordinate" value="25"/>
5355
</actionGroup>
5456
<actionGroup ref="dragContentTypeToContainer" stepKey="addText2">
5557
<argument name="contentType" value="PageBuilderTextContentType"/>
5658
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
5759
<argument name="containerTargetIndex" value="2"/>
60+
<argument name="offsetXCoordinate" value="25"/>
61+
<argument name="offsetYCoordinate" value="25"/>
5862
</actionGroup>
5963
<actionGroup ref="dragContentTypeToContainer" stepKey="addText3">
6064
<argument name="contentType" value="PageBuilderTextContentType"/>
6165
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
6266
<argument name="containerTargetIndex" value="3"/>
67+
<argument name="offsetXCoordinate" value="25"/>
68+
<argument name="offsetYCoordinate" value="25"/>
6369
</actionGroup>
6470
<actionGroup ref="dragContentTypeToContainer" stepKey="addText4">
6571
<argument name="contentType" value="PageBuilderTextContentType"/>
6672
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
6773
<argument name="containerTargetIndex" value="4"/>
74+
<argument name="offsetXCoordinate" value="25"/>
75+
<argument name="offsetYCoordinate" value="25"/>
6876
</actionGroup>
6977
<actionGroup ref="openGridSizeForm" stepKey="openGridSizeForm"/>
7078
<actionGroup ref="updateGridSizeInvalid" stepKey="enterInvalidGridSize">

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
<argument name="contentType" value="PageBuilderColumnContentType"/>
4343
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
4444
<argument name="containerTargetIndex" value="2"/>
45+
<argument name="offsetXCoordinate" value="25"/>
46+
<argument name="offsetYCoordinate" value="25"/>
4547
</actionGroup>
4648
<dragAndDrop selector1="{{ColumnOnBackend.columnX('2')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('10')}}" x="$guideWidth" stepKey="resizeColumn2ToFive"/>
4749
<waitForPageLoad stepKey="waitForDragAndDrop"/>
@@ -52,16 +54,22 @@
5254
<argument name="contentType" value="PageBuilderDividerContentType"/>
5355
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
5456
<argument name="containerTargetIndex" value="1"/>
57+
<argument name="offsetXCoordinate" value="25"/>
58+
<argument name="offsetYCoordinate" value="25"/>
5559
</actionGroup>
5660
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage2">
5761
<argument name="contentType" value="PageBuilderDividerContentType"/>
5862
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
5963
<argument name="containerTargetIndex" value="2"/>
64+
<argument name="offsetXCoordinate" value="25"/>
65+
<argument name="offsetYCoordinate" value="25"/>
6066
</actionGroup>
6167
<actionGroup ref="dragContentTypeToContainer" stepKey="dragIntoStage3">
6268
<argument name="contentType" value="PageBuilderDividerContentType"/>
6369
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
6470
<argument name="containerTargetIndex" value="3"/>
71+
<argument name="offsetXCoordinate" value="25"/>
72+
<argument name="offsetYCoordinate" value="25"/>
6573
</actionGroup>
6674
<!-- Verify Column Number and Size -->
6775
<comment userInput="Verify Column Number and Size" stepKey="context3"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowUpdateAdvancedConfigurationValuesTest.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,15 @@
7575
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
7676
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
7777
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
78-
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
78+
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
7979
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
8080
<argument name="index" value="1"/>
8181
</actionGroup>
82+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage">
83+
<argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
84+
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
85+
<argument name="cssProperty" value="margin"/>
86+
</actionGroup>
8287
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
8388
<argument name="contentType" value="PageBuilderRowContentType"/>
8489
</actionGroup>
@@ -122,10 +127,15 @@
122127
<argument name="borderWidth" value="PageBuilderAdvancedBorderWidthProperty10"/>
123128
<argument name="borderRadius" value="PageBuilderAdvancedBorderRadiusProperty12"/>
124129
<argument name="cssClasses" value="PageBuilderAdvancedCssClassesPropertyThreeClasses"/>
125-
<argument name="margin" value="PageBuilderMarginsPropertyUnique"/>
130+
<argument name="margin" value="PageBuilderMarginsPropertyDefault"/>
126131
<argument name="padding" value="PageBuilderPaddingPropertyUnique"/>
127132
<argument name="index" value="1"/>
128133
</actionGroup>
134+
<actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="validateMarginStage2">
135+
<argument name="selector" value="{{RowOnStage.affordance('1')}}"/>
136+
<argument name="expectedProperty" value="{{PageBuilderMarginsPropertyUnique.value}}"/>
137+
<argument name="cssProperty" value="margin"/>
138+
</actionGroup>
129139
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage3">
130140
<argument name="contentType" value="PageBuilderRowContentType"/>
131141
</actionGroup>

0 commit comments

Comments
 (0)