Skip to content

Commit 3233a56

Browse files
omiroshnichenkoomiroshnichenko
authored
Merge pull request #380 from magento-obsessive-owls/PB-378
[Owls] Full height Banner
2 parents bb6c78f + 14fc9c6 commit 3233a56

13 files changed

+897
-392
lines changed

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

Lines changed: 21 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,26 @@
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>
6383
<actionGroup name="validateContentTypeHeightGreaterThanMinHeight">
6484
<arguments>
6585
<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">
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">
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">
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">
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">
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">
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">
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">

0 commit comments

Comments
 (0)