Skip to content

Commit 86ce972

Browse files
committed
#559: User sees no predefined gutters - Tabs Mftf tests fixes
1 parent 10e05bc commit 86ce972

File tree

4 files changed

+17
-13
lines changed

4 files changed

+17
-13
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,16 @@
596596
<data key="paddingBottom">0</data>
597597
<data key="paddingLeft">10</data>
598598
</entity>
599+
<entity name="PageBuilderPaddingProperty20" type="pagebuilder_padding_property">
600+
<data key="name">Margins and Padding</data>
601+
<data key="section">advanced</data>
602+
<data key="fieldName">margins_and_padding</data>
603+
<data key="value">20</data>
604+
<data key="paddingTop">20</data>
605+
<data key="paddingRight">20</data>
606+
<data key="paddingBottom">20</data>
607+
<data key="paddingLeft">20</data>
608+
</entity>
599609
<entity name="PageBuilderPaddingProperty40" type="pagebuilder_padding_property">
600610
<data key="name">Margins and Padding</data>
601611
<data key="section">advanced</data>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,6 @@
194194
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab1MinHeightCMSBlockStage">
195195
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
196196
<argument name="minHeight" value="{{PageBuilderTabMinimumHeight200Property.value}}"/>
197-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
198-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
199197
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
200198
<argument name="index" value="1"/>
201199
</actionGroup>
@@ -252,8 +250,8 @@
252250
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab2MinHeightCMSPageStage">
253251
<argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
254252
<argument name="minHeight" value="{{PageBuilderTabMinHeight0Property.value}}"/>
255-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
256-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
253+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
254+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
257255
<argument name="index" value="2"/>
258256
</actionGroup>
259257
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabsThroughBlockContentTypeTest.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@
185185
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab1MinHeightCMSBlockStageMobile">
186186
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
187187
<argument name="minHeight" value="{{PageBuilderTabMinimumHeight200Property.value}}"/>
188-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
189-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
190188
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
191189
<argument name="index" value="1"/>
192190
</actionGroup>
@@ -259,8 +257,6 @@
259257
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab1MinHeightCMSBlockStage">
260258
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
261259
<argument name="minHeight" value="{{PageBuilderTabMinimumHeight200Property.value}}"/>
262-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
263-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
264260
<argument name="borderWidth" value="{{PageBuilderAdvancedBorderWidthPropertyDefault.value}}"/>
265261
<argument name="index" value="1"/>
266262
</actionGroup>
@@ -320,8 +316,8 @@
320316
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab2MinHeightCMSPageStageMobile">
321317
<argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
322318
<argument name="minHeight" value="{{PageBuilderTabMinHeight0Property.value}}"/>
323-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
324-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
319+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
320+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
325321
<argument name="index" value="2"/>
326322
</actionGroup>
327323
<!-- Validate CMS Page Stage Desktop Viewport -->
@@ -355,8 +351,8 @@
355351
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateTab2MinHeightCMSPageStage">
356352
<argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
357353
<argument name="minHeight" value="{{PageBuilderTabMinHeight0Property.value}}"/>
358-
<argument name="paddingTop" value="{{PageBuilderPaddingProperty40.paddingTop}}"/>
359-
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty40.paddingBottom}}"/>
354+
<argument name="paddingTop" value="{{PageBuilderPaddingProperty20.paddingTop}}"/>
355+
<argument name="paddingBottom" value="{{PageBuilderPaddingProperty20.paddingBottom}}"/>
360356
<argument name="index" value="2"/>
361357
</actionGroup>
362358
<actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>

app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_default.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
}
3636

3737
&.empty-container {
38-
min-height: 220px;
38+
min-height: 300px;
3939
}
4040

4141
> .element-children {

0 commit comments

Comments
 (0)