Skip to content

Commit b361926

Browse files
committed
MC-5079: Add Box Sizing to Storefront Styles (Border & Height Storefront Issues)
- update test to add Banner instead of Heading with row min height 200
1 parent 1d06dbd commit b361926

File tree

3 files changed

+15
-23
lines changed

3 files changed

+15
-23
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,24 +238,27 @@
238238
<argument name="contentType" value="PageBuilderColumnContentType"/>
239239
</actionGroup>
240240
<actionGroup ref="dragContentTypeToContainer" stepKey="dragContentTypeToContainer">
241-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
241+
<argument name="contentType" value="PageBuilderBannerContentType"/>
242242
<argument name="containerTargetType" value="PageBuilderColumnContentType"/>
243243
</actionGroup>
244244
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightBeforeSave">
245245
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
246246
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
247+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
247248
<argument name="padding" value="PageBuilderPaddingProperty10"/>
248249
</actionGroup>
249250
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightAfterSave">
250251
<argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
251252
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
253+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
252254
<argument name="padding" value="PageBuilderPaddingProperty10"/>
253255
</actionGroup>
254256
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
255257
<argument name="contentType" value="PageBuilderColumnContentType"/>
256258
</actionGroup>
257259
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightStorefront">
258260
<argument name="content" value="{{ColumnOnFrontend.baseCSS}}"/>
261+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
259262
</actionGroup>
260263
</test>
261264
<test name="ColumnConfigurationHasVerticalAlignment">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest.xml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
<argument name="contentType" value="PageBuilderRowContentType"/>
250250
</actionGroup>
251251
<actionGroup ref="fillSlideOutPanelField" stepKey="enterMinHeightProperty">
252-
<argument name="property" value="PageBuilderMinHeightProperty_300"/>
252+
<argument name="property" value="PageBuilderMinHeightProperty_200"/>
253253
</actionGroup>
254254
<actionGroup ref="selectSlideOutPanelField" stepKey="enterBorder">
255255
<argument name="property" value="PageBuilderAdvancedBorderPropertySolid"/>
@@ -267,33 +267,17 @@
267267
<!-- Add tall content to container -->
268268
<comment userInput="Add tall content to container" stepKey="commentAddTallContentToContainer"/>
269269
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
270-
<argument name="group" value="PageBuilderHeadingContentType"/>
270+
<argument name="group" value="PageBuilderBannerContentType"/>
271271
</actionGroup>
272272
<actionGroup ref="dragContentTypeToStage" stepKey="dragContentTypeToContainer">
273-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
274-
</actionGroup>
275-
<pressKey selector="{{HeadingOnStage.headingEditableText('1')}}" userInput="{{PageBuilderHeadingTextProperty.value}}" stepKey="enterHeadingText1"/>
276-
<actionGroup ref="clickOutsideLiveEditHeading" stepKey="clickOutsideLiveEditHeading"/>
277-
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType">
278-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
279-
</actionGroup>
280-
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType2">
281-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
282-
</actionGroup>
283-
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType3">
284-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
285-
</actionGroup>
286-
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType4">
287-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
288-
</actionGroup>
289-
<actionGroup ref="duplicateContentType" stepKey="duplicateContentType5">
290-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
273+
<argument name="contentType" value="PageBuilderBannerContentType"/>
291274
</actionGroup>
292275
<!-- Validate height on stage before save -->
293276
<comment userInput="Validate height on stage before save" stepKey="commentValidateHeightOnStageBeforeSave"/>
294277
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightBeforeSave">
295278
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
296279
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
280+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
297281
<argument name="padding" value="PageBuilderPaddingProperty10"/>
298282
</actionGroup>
299283
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
@@ -303,6 +287,7 @@
303287
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightAfterSave">
304288
<argument name="content" value="{{RowOnStage.baseCSS}}"/>
305289
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
290+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
306291
<argument name="padding" value="PageBuilderPaddingProperty10"/>
307292
</actionGroup>
308293
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -312,6 +297,7 @@
312297
<comment userInput="Validate height on storefront" stepKey="commentValidateHeightOnStorefront"/>
313298
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightStorefront">
314299
<argument name="content" value="{{RowOnStorefront.baseCSS}}"/>
300+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
315301
</actionGroup>
316302
</test>
317303
<test name="RowContentIsVerticallyAligned">

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,27 +238,30 @@
238238
<argument name="section" value="TabOnStage"/>
239239
</actionGroup>
240240
<actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
241-
<argument name="group" value="PageBuilderHeadingContentType"/>
241+
<argument name="group" value="PageBuilderBannerContentType"/>
242242
</actionGroup>
243243
<actionGroup ref="dragContentTypeToContainer" stepKey="dragContentTypeToContainer">
244-
<argument name="contentType" value="PageBuilderHeadingContentType"/>
244+
<argument name="contentType" value="PageBuilderBannerContentType"/>
245245
<argument name="containerTargetType" value="PageBuilderTabsContentType"/>
246246
</actionGroup>
247247
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightBeforeSave">
248248
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
249249
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
250+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
250251
<argument name="padding" value="PageBuilderPaddingProperty10"/>
251252
</actionGroup>
252253
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightAfterSave">
253254
<argument name="content" value="{{TabOnStage.tabContentCSS}}"/>
254255
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
256+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
255257
<argument name="padding" value="PageBuilderPaddingProperty10"/>
256258
</actionGroup>
257259
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
258260
<argument name="contentType" value="PageBuilderTabsContentType"/>
259261
</actionGroup>
260262
<actionGroup ref="validateContentTypeHeightGreaterThanMinHeight" stepKey="validateContentTypeHeightStorefront">
261263
<argument name="content" value="{{TabOnStorefront.tabContentCSS}}"/>
264+
<argument name="height" value="PageBuilderMinHeightProperty_200"/>
262265
</actionGroup>
263266
</test>
264267
<test name="TabContentIsVerticallyAlignedTop">

0 commit comments

Comments
 (0)