Skip to content

Commit a00840d

Browse files
anthoulaanthoula
committed
PB-413: Remove Deprecated Page Builder MFTF Tests, Entities, Action Groups
- remove deprecated action group and references - update arguments to be compatible with new action group
1 parent 2c2d919 commit a00840d

File tree

17 files changed

+112
-132
lines changed

17 files changed

+112
-132
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightEqualToMinHeightActionGroup.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
2828
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
2929
</actionGroup>
30-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSBlockStage">
30+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3131
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
32-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
32+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
3333
<argument name="index" value="1"/>
3434
</actionGroup>
3535
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStage">
3636
<argument name="section" value="ColumnOnFrontend"/>
3737
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
3838
</actionGroup>
39-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStage">
39+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
4040
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
41-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
41+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
4242
<argument name="index" value="1"/>
4343
</actionGroup>
4444
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
4545
<argument name="section" value="ColumnOnFrontend"/>
4646
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
4747
</actionGroup>
48-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStorefront">
48+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
4949
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
50-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
50+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
5151
<argument name="index" value="1"/>
5252
</actionGroup>
5353
</test>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
2828
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
2929
</actionGroup>
30-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSBlockStage">
30+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3131
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
32-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
32+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
3333
<argument name="index" value="1"/>
3434
</actionGroup>
3535
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStage">
3636
<argument name="section" value="ColumnOnFrontend"/>
3737
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
3838
</actionGroup>
39-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStage">
39+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
4040
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
41-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
41+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
4242
<argument name="index" value="1"/>
4343
</actionGroup>
4444
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
4545
<argument name="section" value="ColumnOnFrontend"/>
4646
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
4747
</actionGroup>
48-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStorefront">
48+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
4949
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
50-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
50+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
5151
<argument name="index" value="1"/>
5252
</actionGroup>
5353
</test>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@
138138
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
139139
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
140140
</actionGroup>
141-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSBlockStage">
141+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
142142
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
143-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
143+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
144144
<argument name="index" value="1"/>
145145
</actionGroup>
146146
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">
@@ -190,9 +190,9 @@
190190
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
191191
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
192192
</actionGroup>
193-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStage">
193+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
194194
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
195-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
195+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
196196
<argument name="index" value="1"/>
197197
</actionGroup>
198198
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStage">
@@ -235,9 +235,9 @@
235235
<argument name="minHeight" value="PageBuilderMinHeightProperty_200"/>
236236
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
237237
</actionGroup>
238-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStorefront">
238+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
239239
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
240-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
240+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
241241
<argument name="index" value="1"/>
242242
</actionGroup>
243243
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStorefront">
@@ -259,9 +259,9 @@
259259
<argument name="backgroundImage" value="PageBuilderBackgroundMobileImage_GIF"/>
260260
<argument name="index" value="1"/>
261261
</actionGroup>
262-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStorefrontMobile">
262+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefrontMobile">
263263
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
264-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
264+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
265265
<argument name="index" value="1"/>
266266
</actionGroup>
267267
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStorefrontMobile">

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
2828
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
2929
</actionGroup>
30-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSBlockStage">
30+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3131
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
32-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
32+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
3333
<argument name="index" value="1"/>
3434
</actionGroup>
3535
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSPageStage">
3636
<argument name="section" value="ColumnOnFrontend"/>
3737
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
3838
</actionGroup>
39-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStage">
39+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
4040
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
41-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
41+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
4242
<argument name="index" value="1"/>
4343
</actionGroup>
4444
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
4545
<argument name="section" value="ColumnOnFrontend"/>
4646
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
4747
</actionGroup>
48-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateColumn1HeightCMSPageStorefront">
48+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
4949
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
50-
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
50+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_200.value}}"/>
5151
<argument name="index" value="1"/>
5252
</actionGroup>
5353
</test>

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,11 @@
128128
<argument name="minHeight" value="PageBuilderMinHeightProperty_500px"/>
129129
<argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
130130
</actionGroup>
131-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSBlockStage">
131+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSBlockStage">
132132
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
133-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
134-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
133+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty10.value}}"/>
134+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty10.value}}"/>
135+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
135136
</actionGroup>
136137
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">
137138
<argument name="page" value="DividerOnStage"/>
@@ -205,9 +206,9 @@
205206
<argument name="containerIndex" value="1"/>
206207
<argument name="contentIndex" value="1"/>
207208
</actionGroup>
208-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSPageStage">
209+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSPageStage">
209210
<argument name="content" value="{{RowOnStorefront.baseCSS}}"/>
210-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
211+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
211212
<argument name="index" value="2"/>
212213
</actionGroup>
213214
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStage">
@@ -258,9 +259,9 @@
258259
<argument name="containerIndex" value="1"/>
259260
<argument name="contentIndex" value="1"/>
260261
</actionGroup>
261-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSPageStorefront">
262+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSPageStorefront">
262263
<argument name="content" value="{{RowOnStorefront.baseCSS}}"/>
263-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
264+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
264265
<argument name="index" value="2"/>
265266
</actionGroup>
266267
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStorefront">
@@ -282,9 +283,9 @@
282283
<argument name="containerIndex" value="1"/>
283284
<argument name="contentIndex" value="1"/>
284285
</actionGroup>
285-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSPageStorefrontMobile">
286+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSPageStorefrontMobile">
286287
<argument name="content" value="{{RowOnStorefront.baseCSS}}"/>
287-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
288+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
288289
<argument name="index" value="2"/>
289290
</actionGroup>
290291
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSPageStorefrontMobile">

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@
4040
<argument name="backgroundRepeat" value="PageBuilderBackgroundRepeat_Enabled"/>
4141
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Fixed"/>
4242
</actionGroup>
43-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSBlockStage">
43+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSBlockStage">
4444
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
45-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
46-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
45+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
46+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty10.value}}"/>
47+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty10.value}}"/>
4748
</actionGroup>
4849
<comment userInput="---merging to remove step---" stepKey="validateParallaxBackgroundCMSBlockStage"/>
4950
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSBlockStage">

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@
4242
<argument name="backgroundRepeat" value="PageBuilderBackgroundRepeat_Enabled"/>
4343
<argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Fixed"/>
4444
</actionGroup>
45-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateRowHeightCMSBlockStage">
45+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSBlockStage">
4646
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
47-
<argument name="height" value="PageBuilderMinHeightProperty_500"/>
48-
<argument name="padding" value="PageBuilderPaddingProperty10"/>
47+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
48+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty10.value}}"/>
49+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty10.value}}"/>
4950
</actionGroup>
5051
<actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateRowParallaxBackgroundCMSPageStage">
5152
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>

0 commit comments

Comments
 (0)