Skip to content

Commit cfdd3eb

Browse files
hannahnidahannahnida
committed
#559: User sees no predefined gutters - Mftf fixes
1 parent 5533396 commit cfdd3eb

13 files changed

+38
-21
lines changed

‎app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -610,11 +610,11 @@
610610
<data key="name">Margins and Padding</data>
611611
<data key="section">advanced</data>
612612
<data key="fieldName">margins_and_padding</data>
613-
<data key="value">10</data>
614-
<data key="paddingTop">10</data>
615-
<data key="paddingRight">10</data>
616-
<data key="paddingBottom">10</data>
617-
<data key="paddingLeft">10</data>
613+
<data key="value">0</data>
614+
<data key="paddingTop">0</data>
615+
<data key="paddingRight">0</data>
616+
<data key="paddingBottom">0</data>
617+
<data key="paddingLeft">0</data>
618618
</entity>
619619
<entity name="PageBuilderPaddingPropertyOverlayDefault" type="pagebuilder_padding_property">
620620
<data key="name">Margins and Padding</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductAddAndEditRowColumnSlideTest.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
<actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
4141
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
4242
</after>
43+
<!-- Edit 1st Row -->
44+
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuRow">
45+
<argument name="contentType" value="PageBuilderRowContentType"/>
46+
</actionGroup>
47+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
48+
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
49+
</actionGroup>
50+
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsRow"/>
4351
<!-- Add 2nd Row -->
4452
<comment userInput="Add 2nd Row" stepKey="commentAddRow"/>
4553
<actionGroup ref="dragContentTypeToDropZone" stepKey="dragRowToStage">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@
4444
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenuForRow">
4545
<argument name="contentType" value="PageBuilderRowContentType"/>
4646
</actionGroup>
47+
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
48+
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
49+
</actionGroup>
4750
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColorRow">
4851
<argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
4952
</actionGroup>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@
133133
</actionGroup>
134134
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSBlockStage">
135135
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
136-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty10.paddingTop}}"/>
137-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty10.paddingBottom}}"/>
138136
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
139137
</actionGroup>
140138
<actionGroup ref="validateDividerWidthPercentage" stepKey="validateDividerWidthCMSBlockStage">

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSBlockStage">
4646
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
4747
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
48-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty10.paddingTop}}"/>
49-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty10.paddingBottom}}"/>
5048
</actionGroup>
5149
<comment userInput="---merging to remove step---" stepKey="validateParallaxBackgroundCMSBlockStage"/>
5250
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSBlockStage">

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@
4848
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateRowHeightCMSBlockStage">
4949
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
5050
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_500.value}}"/>
51-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty10.paddingTop}}"/>
52-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty10.paddingBottom}}"/>
5351
</actionGroup>
5452
<actionGroup ref="validateRowParallaxBackgroundAttributes" stepKey="validateRowParallaxBackgroundCMSPageStage">
5553
<argument name="page" value="RowOnStorefront_FullWidth_FullBleed"/>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
</assertEquals>
4848
<comment userInput="Validate Row Height adjusts to Tabs inside Column" stepKey="commentValidateRowHeightWithColumnAndTabs"/>
4949
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderRowContentType.role,'1')}}" stepKey="actualStageRowHeightWithColumnsAndTabs"/>
50-
<executeJS function="return Math.round({$actualStageColumnHeightWithTabs}+{{PageBuilderPaddingProperty10.paddingTop}}+{{PageBuilderPaddingProperty10.paddingBottom}})" stepKey="expectedRowHeightWithColumnTabsAndPadding"/>
50+
<executeJS function="return Math.round({$actualStageColumnHeightWithTabs})" stepKey="expectedRowHeightWithColumnTabsAndPadding"/>
5151
<assertGreaterThanOrEqual stepKey="assertRowHeightAdjustsToTabsHeight">
5252
<expectedResult type="variable">expectedRowHeightWithColumnTabsAndPadding</expectedResult>
5353
<actualResult type="variable">actualStageRowHeightWithColumnsAndTabs</actualResult>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetSmallMinimumHeightAndHeightAdjustsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderColumnContentType.role,'1')}}" stepKey="actualStageInitialColumnHeight"/>
5454
<comment userInput="Validate Row Height adjusts to Column Height" stepKey="commentValidateRowHeightAdjustToColumn"/>
5555
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderRowContentType.role,'1')}}" stepKey="actualStageRowHeightWithColumns"/>
56-
<executeJS function="return Math.round({$actualStageInitialColumnHeight}+{{PageBuilderPaddingProperty10.paddingTop}}+{{PageBuilderPaddingProperty10.paddingBottom}})" stepKey="expectedRowHeightWithPaddingAndColumns"/>
56+
<executeJS function="return Math.round({$actualStageInitialColumnHeight})" stepKey="expectedRowHeightWithPaddingAndColumns"/>
5757
<assertGreaterThanOrEqual stepKey="assertRowHeightAdjustsToColumnHeight">
5858
<expectedResult type="variable">expectedRowHeightWithPaddingAndColumns</expectedResult>
5959
<actualResult type="variable">actualStageRowHeightWithColumns</actualResult>
@@ -74,7 +74,7 @@
7474
</assertGreaterThanOrEqual>
7575
<comment userInput="Validate Row Height adjusts to Tabs inside Column" stepKey="commentValidateRowHeightWithColumnAndTabs"/>
7676
<executeJS function="{{PageBuilderStage.computedHeightOnStage(PageBuilderRowContentType.role,'1')}}" stepKey="actualStageRowHeightWithColumnsAndTabs"/>
77-
<executeJS function="return Math.round({$actualStageColumnHeightWithTabs}+{{PageBuilderPaddingProperty10.paddingTop}}+{{PageBuilderPaddingProperty10.paddingBottom}})" stepKey="expectedRowHeightWithColumnTabsAndPadding"/>
77+
<executeJS function="return Math.round({$actualStageColumnHeightWithTabs})" stepKey="expectedRowHeightWithColumnTabsAndPadding"/>
7878
<assertGreaterThanOrEqual stepKey="assertRowHeightAdjustsToTabsHeight">
7979
<expectedResult type="variable">expectedRowHeightWithColumnTabsAndPadding</expectedResult>
8080
<actualResult type="variable">actualStageRowHeightWithColumnsAndTabs</actualResult>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<argument name="contentType" value="PageBuilderRowContentType"/>
3333
<argument name="index" value="1"/>
3434
<argument name="containerDefaultHeight" value="PageBuilderRowDefaultHeight"/>
35-
<argument name="expectedPaddingTop" value="PageBuilderPaddingProperty10"/>
36-
<argument name="expectedPaddingBottom" value="PageBuilderPaddingProperty10"/>
35+
<argument name="expectedPaddingTop" value="PageBuilderPaddingPropertyDefault"/>
36+
<argument name="expectedPaddingBottom" value="PageBuilderPaddingPropertyDefault"/>
3737
</actionGroup>
3838
<actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
3939
<argument name="contentType" value="PageBuilderColumnContentType"/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<argument name="contentType" value="PageBuilderRowContentType"/>
4747
<argument name="index" value="1"/>
4848
<argument name="containerDefaultHeight" value="PageBuilderRowDefaultHeight"/>
49-
<argument name="expectedPaddingTop" value="PageBuilderPaddingProperty10"/>
50-
<argument name="expectedPaddingBottom" value="PageBuilderPaddingProperty10"/>
49+
<argument name="expectedPaddingTop" value="PageBuilderPaddingPropertyDefault"/>
50+
<argument name="expectedPaddingBottom" value="PageBuilderPaddingPropertyDefault"/>
5151
</actionGroup>
5252
</test>
5353
</tests>

0 commit comments

Comments
 (0)