Skip to content

Commit eebe5ae

Browse files
dhaeckerdhaecker
committed
PB-378: Full height Banner
- Updating deprecation messages and data entities
1 parent 57adbd0 commit eebe5ae

6 files changed

+45
-22
lines changed

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

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<waitForElementVisible selector="{{page.verticalAlignContainer(index, verticalAlignContainer.value)}}" stepKey="waitForVerticalAlignContainer"/>
4242
</actionGroup>
4343
<!-- Validate Min Height -->
44-
<actionGroup name="validateContentTypeHeightEqualToMinHeight">
44+
<actionGroup name="validateContentTypeHeightEqualToMinHeight" deprecated="Use validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder instead. Will be removed in PB-413.">
4545
<annotations>
4646
<description>Validates that a content type's minimum height is equal to it's actual height minus top padding minus bottom padding minus border width times two.</description>
4747
</annotations>
@@ -60,6 +60,28 @@
6060
<actualResult type="variable">contentTypeHeightDifference</actualResult>
6161
</assertLessThanOrEqual>
6262
</actionGroup>
63+
<actionGroup name="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder">
64+
<annotations>
65+
<description>Validates that a content type's minimum height is equal to it's actual height minus top padding minus bottom padding minus border width times two.</description>
66+
</annotations>
67+
<arguments>
68+
<argument name="content" type="string"/>
69+
<argument name="index" defaultValue="1" type="string"/>
70+
<argument name="borderWidth" defaultValue="{{PageBuilderAdvancedBorderWidthProperty0.value}}" type="string"/>
71+
<argument name="minHeight" defaultValue="{{PageBuilderMinHeightProperty_300px.intValue}}" type="string"/>
72+
<argument name="paddingTop" defaultValue="{{PageBuilderPaddingPropertyDefault.paddingTop}}" type="string"/>
73+
<argument name="paddingBottom" defaultValue="{{PageBuilderPaddingPropertyDefault.paddingBottom}}" type="string"/>
74+
<argument name="pixelBuffer" defaultValue="5" type="string"/>
75+
</arguments>
76+
<executeJS function="return document.querySelectorAll('{{content}}')[{{index}}-1].getBoundingClientRect().height-{{paddingTop}}-{{paddingBottom}}-({{borderWidth}}*2)" stepKey="actualContentHeight"/>
77+
<executeJS function="return Math.round(Math.abs({$actualContentHeight}-{{minHeight}}))" stepKey="contentTypeHeightDifference"/>
78+
<assertLessThanOrEqual stepKey="assertContentHeightRatio">
79+
<expectedResult type="int">{{pixelBuffer}}</expectedResult>
80+
<actualResult type="variable">contentTypeHeightDifference</actualResult>
81+
</assertLessThanOrEqual>
82+
</actionGroup>
83+
84+
6385
<actionGroup name="validateContentTypeHeightGreaterThanMinHeight">
6486
<arguments>
6587
<argument name="content" type="string"/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,44 +9,44 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<!-- Appearance -->
12-
<entity name="PageBuilderBannerAppearanceDefaultProperty" type="pagebuilder_banner_appearance_property" deprecated="true">
12+
<entity name="PageBuilderBannerAppearanceDefaultProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_Poster instead. Will be removed in PB-413.">
1313
<data key="name">Appearance</data>
1414
<data key="section">appearance_fieldset</data>
1515
<data key="fieldName">appearance</data>
1616
<data key="value">poster</data>
1717
</entity>
18-
<entity name="PageBuilderBannerAppearance_Poster" type="pagebuilder_banner_appearance_property" deprecated="true">
18+
<entity name="PageBuilderBannerAppearance_Poster" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_Poster instead. Will be removed in PB-413.">
1919
<data key="name">Appearance</data>
2020
<data key="section">appearance_fieldset</data>
2121
<data key="fieldName">appearance</data>
2222
<data key="value">poster</data>
2323
</entity>
24-
<entity name="PageBuilderBannerCollageLeftProperty" type="pagebuilder_banner_appearance_property" deprecated="true">
24+
<entity name="PageBuilderBannerCollageLeftProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageLeft instead. Will be removed in PB-413.">
2525
<data key="name">Appearance</data>
2626
<data key="section">appearance_fieldset</data>
2727
<data key="fieldName">appearance</data>
2828
<data key="value">collage-left</data>
2929
</entity>
30-
<entity name="PageBuilderBannerCollageRightProperty" type="pagebuilder_banner_appearance_property" deprecated="true">
30+
<entity name="PageBuilderBannerCollageRightProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageCentered instead. Will be removed in PB-413.">
3131
<data key="name">Appearance</data>
3232
<data key="section">appearance_fieldset</data>
3333
<data key="fieldName">appearance</data>
3434
<data key="value">collage-right</data>
3535
</entity>
36-
<entity name="PageBuilderBannerCollageCenteredProperty" type="pagebuilder_banner_appearance_property" deprecated="true">
36+
<entity name="PageBuilderBannerCollageCenteredProperty" type="pagebuilder_banner_appearance_property" deprecated="Use PageBuilderAppearance_CollageRight instead. Will be removed in PB-413.">
3737
<data key="name">Appearance</data>
3838
<data key="section">appearance_fieldset</data>
3939
<data key="fieldName">appearance</data>
4040
<data key="value">collage-centered</data>
4141
</entity>
4242
<!-- Minimum Height -->
43-
<entity name="PageBuilderBannerMinimumHeightProperty" type="pagebuilder_banner_minimumHeight_property" deprecated="true">
43+
<entity name="PageBuilderBannerMinimumHeightProperty" type="pagebuilder_banner_minimumHeight_property" deprecated="Use PageBuilderMinHeightProperty_500px instead. Will be removed in PB-413.">
4444
<data key="name">Minimum Height</data>
4545
<data key="section">appearance_fieldset</data>
4646
<data key="fieldName">min_height</data>
4747
<data key="value">500</data>
4848
</entity>
49-
<entity name="PageBuilderBannerMinimumHeightDefaultProperty" type="pagebuilder_banner_minimumHeightDefault_property" deprecated="true">
49+
<entity name="PageBuilderBannerMinimumHeightDefaultProperty" type="pagebuilder_banner_minimumHeightDefault_property" deprecated="Use PageBuilderMinHeightProperty_300px instead. Will be removed in PB-413.">
5050
<data key="name">Minimum Height</data>
5151
<data key="section">appearance_fieldset</data>
5252
<data key="fieldName">min_height</data>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<data key="section">appearance_fieldset</data>
5151
<data key="fieldName">min_height</data>
5252
<data key="value">300px</data>
53+
<data key="intValue">300</data>
5354
<data key="style">min-height: 300px</data>
5455
</entity>
5556
<entity name="PageBuilderMinHeightProperty_200" type="pagebuilder_min_height_property">

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -921,16 +921,16 @@
921921
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
922922
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
923923
</actionGroup>
924-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightBeforeSave">
924+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateContentTypeHeightBeforeSave">
925925
<argument name="content" value="{{BannerOnBackend.wrapperCSS}}"/>
926926
</actionGroup>
927-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightAfterSave">
927+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateContentTypeHeightAfterSave">
928928
<argument name="content" value="{{BannerOnBackend.wrapperCSS}}"/>
929929
</actionGroup>
930930
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
931931
<argument name="contentType" value="PageBuilderBannerContentType"/>
932932
</actionGroup>
933-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightStorefront">
933+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateContentTypeHeightStorefront">
934934
<argument name="content" value="{{BannerOnFrontend.wrapperCSS}}"/>
935935
</actionGroup>
936936
</test>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,18 +1612,18 @@
16121612
<actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
16131613
<argument name="property" value="PageBuilderMinHeightProperty_300px"/>
16141614
</actionGroup>
1615-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightBeforeSave">
1615+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateContentTypeHeightBeforeSave">
16161616
<argument name="content" value="{{BannerOnBackend.wrapperCSS}}"/>
16171617
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
16181618
</actionGroup>
1619-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightAfterSave">
1619+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateContentTypeHeightAfterSave">
16201620
<argument name="content" value="{{BannerOnBackend.wrapperCSS}}"/>
16211621
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
16221622
</actionGroup>
16231623
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
16241624
<argument name="contentType" value="PageBuilderBannerContentType"/>
16251625
</actionGroup>
1626-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateContentTypeHeightStorefront">
1626+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateContentTypeHeightStorefront">
16271627
<argument name="content" value="{{BannerOnFrontend.wrapperCSS}}"/>
16281628
<argument name="border" value="PageBuilderAdvancedBorderWidthProperty10"/>
16291629
</actionGroup>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTests.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,9 @@
545545
<argument name="page" value="BannerOnBackend"/>
546546
</actionGroup>
547547
<seeElement selector="{{BannerOnBackend.posterMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSBlockStage"/>
548-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSBlockStage">
548+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSBlockStage">
549549
<argument name="content" value="{{BannerOnBackend.wrapperCSS}}"/>
550-
<argument name="height" value="PageBuilderBannerMinimumHeightProperty"/>
550+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
551551
</actionGroup>
552552
<actionGroup ref="validateBackgroundAttributesWithNoImage" stepKey="validateBackgroundAttributesCMSBlockStage">
553553
<argument name="section" value="BannerOnBackend"/>
@@ -607,9 +607,9 @@
607607
<argument name="page" value="BannerOnFrontend"/>
608608
</actionGroup>
609609
<seeElement selector="{{BannerOnFrontend.posterMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSPageStage"/>
610-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStage">
610+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStage">
611611
<argument name="content" value="{{BannerOnFrontend.wrapperCSS}}"/>
612-
<argument name="height" value="PageBuilderBannerMinimumHeightProperty"/>
612+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
613613
</actionGroup>
614614
<actionGroup ref="validateBackgroundAttributesWithNoImage" stepKey="validateBackgroundAttributesCMSPageStage">
615615
<argument name="section" value="BannerOnFrontend"/>
@@ -650,9 +650,9 @@
650650
<argument name="page" value="BannerOnFrontend"/>
651651
</actionGroup>
652652
<seeElement selector="{{BannerOnFrontend.posterMinimumHeight('1', PageBuilderMinHeightProperty_500px.value)}}" stepKey="seeMinimumHeightCMSPageStorefront"/>
653-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStorefront">
653+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStorefront">
654654
<argument name="content" value="{{BannerOnFrontend.wrapperCSS}}"/>
655-
<argument name="height" value="PageBuilderBannerMinimumHeightProperty"/>
655+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
656656
</actionGroup>
657657
<actionGroup ref="validateBackgroundAttributesWithNoImage" stepKey="validateBackgroundAttributesCMSPageStorefront">
658658
<argument name="section" value="BannerOnFrontend"/>
@@ -701,9 +701,9 @@
701701
<actionGroup ref="validateOverlayPositionPoster" stepKey="validateOverlayPositionCMSPageStorefrontMobile">
702702
<argument name="page" value="BannerOnFrontend"/>
703703
</actionGroup>
704-
<actionGroup ref="validateContentTypeHeightEqualToMinHeight" stepKey="validateHeightCMSPageStorefrontMobile">
704+
<actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateHeightCMSPageStorefrontMobile">
705705
<argument name="content" value="{{BannerOnFrontend.wrapperCSS}}"/>
706-
<argument name="height" value="PageBuilderBannerMinimumHeightProperty"/>
706+
<argument name="height" value="{{PageBuilderMinHeightProperty_500px.intValue}}"/>
707707
</actionGroup>
708708
<actionGroup ref="validateBackgroundImageContainer" stepKey="validateBackgroundImageCMSPageStorefrontMobile">
709709
<argument name="section" value="BannerOnFrontend"/>

0 commit comments

Comments
 (0)