Skip to content

Commit cf855f6

Browse files
omiroshnichenkoomiroshnichenko
committed
#559: User sees no predefined gutters
- fix content type duplication issue on mobile viewport - fix column width converter - fix mftf test after gutters removal
1 parent 4458633 commit cf855f6

26 files changed

+187
-146
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,26 @@
2323
<data key="style">min-height: 0px</data>
2424
<data key="tooltipText">Style changes will only affect this breakpoint</data>
2525
</entity>
26-
<entity name="PageBuilderMinHeightProperty_60" type="pagebuilder_min_height_property">
26+
<entity name="PageBuilderMinHeightProperty_20" type="pagebuilder_min_height_property">
2727
<data key="name">Minimum Height</data>
2828
<data key="section">appearance_fieldset</data>
2929
<data key="fieldName">min_height</data>
30-
<data key="value">60</data>
31-
<data key="style">min-height: 60px</data>
30+
<data key="value">20</data>
31+
<data key="style">min-height: 20px</data>
3232
</entity>
33-
<entity name="PageBuilderMinHeightProperty_85" type="pagebuilder_min_height_property">
33+
<entity name="PageBuilderMinHeightProperty_45" type="pagebuilder_min_height_property">
3434
<data key="name">Minimum Height</data>
3535
<data key="section">appearance_fieldset</data>
3636
<data key="fieldName">min_height</data>
37-
<data key="value">85</data>
38-
<data key="style">min-height: 85px</data>
37+
<data key="value">45</data>
38+
<data key="style">min-height: 45px</data>
39+
</entity>
40+
<entity name="PageBuilderMinHeightProperty_75" type="pagebuilder_min_height_property">
41+
<data key="name">Minimum Height</data>
42+
<data key="section">appearance_fieldset</data>
43+
<data key="fieldName">min_height</data>
44+
<data key="value">75</data>
45+
<data key="style">min-height: 75px</data>
3946
</entity>
4047
<entity name="PageBuilderMinHeightProperty_500" type="pagebuilder_min_height_property">
4148
<data key="name">Minimum Height</data>

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,6 @@
7070
<data key="value"/>
7171
<data key="tooltipText">Style changes will only affect this breakpoint</data>
7272
</entity>
73-
<entity name="PageBuilderTabMinimumHeightEmptyContainerProperty" type="pagebuilder_tab_property">
74-
<data key="name">Minimum Height</data>
75-
<data key="section">general</data>
76-
<data key="fieldName">min_height</data>
77-
<data key="value">220</data>
78-
<data key="tooltipText">Style changes will only affect this breakpoint</data>
79-
</entity>
8073
<entity name="PageBuilderTabMinHeight0Property" type="pagebuilder_tab_property">
8174
<data key="name">Minimum Height</data>
8275
<data key="section">general</data>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
<data key="value">0</data>
4343
<data key="tooltipText">Style changes will only affect this breakpoint</data>
4444
</entity>
45-
<entity name="PageBuilderTabsMinHeightProperty_80" type="pagebuilder_tabs_property">
45+
<entity name="PageBuilderTabsMinHeightProperty_40" type="pagebuilder_tabs_property">
4646
<data key="name">Minimum Height</data>
4747
<data key="section">general</data>
4848
<data key="fieldName">min_height</data>
49-
<data key="value">80</data>
49+
<data key="value">40</data>
5050
<data key="tooltipText">Style changes will only affect this breakpoint</data>
5151
</entity>
5252
<entity name="PageBuilderTabsMinHeightProperty_200" type="pagebuilder_tabs_property">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,16 @@
154154
<actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
155155
<argument name="page" value="$$createCMSPage.identifier$$"/>
156156
</actionGroup>
157-
<seeNumberOfElements selector="{{RowOnStorefront.allRows}}" userInput="1" stepKey="seeOneRowStorefront"/>
158-
<seeNumberOfElements selector="{{ColumnOnFrontend.allColumns}}" userInput="2" stepKey="seeTwoColumnsStorefront"/>
157+
<executeJS function="return document.querySelectorAll(&quot;{{RowOnStorefront.allRows}}&quot;).length" stepKey="numberOfRowContentTypesStorefront"/>
158+
<assertEquals stepKey="assertRowStorefront">
159+
<expectedResult type="int">1</expectedResult>
160+
<actualResult type="variable">numberOfRowContentTypesStorefront</actualResult>
161+
</assertEquals>
162+
<executeJS function="return document.querySelectorAll(&quot;{{ColumnOnFrontend.baseCSS}}&quot;).length" stepKey="numberOfColumnsContentTypesStorefront"/>
163+
<assertEquals stepKey="assertColumnsStorefront">
164+
<expectedResult type="int">2</expectedResult>
165+
<actualResult type="variable">numberOfColumnsContentTypesStorefront</actualResult>
166+
</assertEquals>
159167
<seeNumberOfElements selector="{{TabOnStorefront.allTabs}}" userInput="1" stepKey="seeOneTabStorefront"/>
160168
<executeJS function="return document.querySelectorAll(&quot;{{HtmlOnStorefront.allHtml}}&quot;).length" stepKey="numberOfHTMLContentTypesStorefront"/>
161169
<assertEquals stepKey="assertHTMLStorefront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
<!-- Validate CMS Block Stage Desktop Viewport -->
3434
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
3535
<argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
36-
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
36+
<argument name="height" value="PageBuilderMinHeightProperty_75"/>
3737
</actionGroup>
3838
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3939
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
40-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
40+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_75.value}}"/>
4141
<argument name="index" value="1"/>
4242
</actionGroup>
4343

@@ -51,22 +51,25 @@
5151
<!-- Validate CMS Page Stage Desktop Viewport -->
5252
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5353
<argument name="section" value="ColumnOnFrontend"/>
54-
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
54+
<argument name="height" value="PageBuilderMinHeightProperty_20"/>
5555
</actionGroup>
5656
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5757
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
58-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
58+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_20.value}}"/>
5959
<argument name="index" value="1"/>
6060
</actionGroup>
6161

6262
<!-- Validate CMS Page Storefront -->
6363
<actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6464
<argument name="section" value="ColumnOnFrontend"/>
65-
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
65+
<argument name="height" value="PageBuilderMinHeightProperty_45"/>
6666
</actionGroup>
6767
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
6868
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
69-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
69+
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthProperty1.value}}"/>
70+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_0.value}}"/>
71+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
72+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
7073
<argument name="index" value="1"/>
7174
</actionGroup>
7275

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
<!-- Validate CMS Block Stage Desktop Viewport -->
3434
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
3535
<argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
36-
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
36+
<argument name="height" value="PageBuilderMinHeightProperty_75"/>
3737
</actionGroup>
3838
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3939
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
40-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
40+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_75.value}}"/>
4141
<argument name="index" value="1"/>
4242
</actionGroup>
4343

@@ -51,11 +51,11 @@
5151
<!-- Validate CMS Page Stage Desktop Viewport -->
5252
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5353
<argument name="section" value="ColumnOnFrontend"/>
54-
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
54+
<argument name="height" value="PageBuilderMinHeightProperty_20"/>
5555
</actionGroup>
5656
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
5757
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
58-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
58+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_20.value}}"/>
5959
<argument name="index" value="1"/>
6060
</actionGroup>
6161

@@ -68,11 +68,14 @@
6868
</actionGroup>
6969
<actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
7070
<argument name="section" value="ColumnOnFrontend"/>
71-
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
71+
<argument name="height" value="PageBuilderMinHeightProperty_45"/>
7272
</actionGroup>
7373
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
7474
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
75-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
75+
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthProperty1.value}}"/>
76+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_0.value}}"/>
77+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
78+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
7679
<argument name="index" value="1"/>
7780
</actionGroup>
7881

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@
271271
</actionGroup>
272272
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
273273
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
274-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
274+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_20.value}}"/>
275275
<argument name="index" value="1"/>
276276
</actionGroup>
277277
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStage">
@@ -317,7 +317,10 @@
317317
</actionGroup>
318318
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
319319
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
320-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
320+
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthProperty1.value}}"/>
321+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_0.value}}"/>
322+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
323+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
321324
<argument name="index" value="1"/>
322325
</actionGroup>
323326
<actionGroup ref="verifyVerticalAlignmentCenterInBlock" stepKey="verifyVerticalAlignmentCenterCMSPageStorefront">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
<!-- Validate CMS Block Stage Desktop Viewport -->
3333
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
3434
<argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
35-
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
35+
<argument name="height" value="PageBuilderMinHeightProperty_75"/>
3636
</actionGroup>
3737
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
3838
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
39-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
39+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_75.value}}"/>
4040
<argument name="index" value="1"/>
4141
</actionGroup>
4242

@@ -56,22 +56,25 @@
5656
</actionGroup>
5757
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSPageStage">
5858
<argument name="section" value="ColumnOnFrontend"/>
59-
<argument name="height" value="PageBuilderMinHeightProperty_60"/>
59+
<argument name="height" value="PageBuilderMinHeightProperty_20"/>
6060
</actionGroup>
6161
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStage">
6262
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
63-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_60.value}}"/>
63+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_20.value}}"/>
6464
<argument name="index" value="1"/>
6565
</actionGroup>
6666

6767
<!-- Validate CMS Page Storefront -->
6868
<actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSPageStorefront">
6969
<argument name="section" value="ColumnOnFrontend"/>
70-
<argument name="height" value="PageBuilderMinHeightProperty_85"/>
70+
<argument name="height" value="PageBuilderMinHeightProperty_45"/>
7171
</actionGroup>
7272
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSPageStorefront">
7373
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
74-
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_85.value}}"/>
74+
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthProperty1.value}}"/>
75+
<argument name="minHeight" value="{{PageBuilderMinHeightProperty_0.value}}"/>
76+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
77+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
7578
<argument name="index" value="1"/>
7679
</actionGroup>
7780

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColorRow">
5454
<argument name="property" value="PageBuilderBackgroundColor_Hex_Grey"/>
5555
</actionGroup>
56-
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinimumHeightProperty">
57-
<argument name="property" value="PageBuilderMinHeightProperty_100px"/>
56+
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
57+
<argument name="property" value="PageBuilderPaddingProperty10"/>
5858
</actionGroup>
5959
<actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveEditFormForRow"/>
6060
<!-- Duplicate and Validate Stage -->

‎app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileRowMinHeightTest.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626
<argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
2727
</actionGroup>
2828
<actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
29+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
30+
<argument name="contentType" value="PageBuilderRowContentType"/>
31+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
32+
</actionGroup>
2933
</before>
3034
<after>
3135
<resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
@@ -38,7 +42,7 @@
3842
<argument name="index" value="1"/>
3943
</actionGroup>
4044
<actionGroup ref="fillSlideOutPanelFieldPadding" stepKey="enterPadding">
41-
<argument name="property" value="PageBuilderPadding_0"/>
45+
<argument name="property" value="PageBuilderPaddingProperty0"/>
4246
</actionGroup>
4347
<actionGroup ref="fillSlideOutPanelFieldMargins" stepKey="enterMargins">
4448
<argument name="property" value="PageBuilderMarginsPropertyDefault"/>
@@ -221,6 +225,10 @@
221225
<argument name="CMSPage" value="$$createCMSPage$$"/>
222226
</actionGroup>
223227
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
228+
<actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
229+
<argument name="contentType" value="PageBuilderRowContentType"/>
230+
<argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
231+
</actionGroup>
224232
<actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPanelAddContentMenuSection">
225233
<argument name="contentType" value="PageBuilderBlockContentType"/>
226234
</actionGroup>

0 commit comments

Comments
 (0)