Skip to content

Commit 1768665

Browse files
cspruiellcspruiell
committed
Merge remote-tracking branch 'owls/develop' into PB-416-phpgtdom
2 parents f23fdaa + 612c402 commit 1768665

File tree

48 files changed

+2129
-705
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+2129
-705
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<argument name="index" defaultValue="1" type="string"/>
1616
<argument name="backgroundColor" defaultValue=""/>
1717
<argument name="backgroundImage" defaultValue=""/>
18-
<argument name="backgroundPosition" defaultValue="PageBuilderRowBackgroundPosition_Default"/>
19-
<argument name="backgroundSize" defaultValue="PageBuilderRowBackgroundSize_Default"/>
20-
<argument name="backgroundRepeat" defaultValue="PageBuilderRowBackgroundRepeat_Default"/>
21-
<argument name="backgroundAttachment" defaultValue="PageBuilderRowBackgroundAttachment_Default"/>
18+
<argument name="backgroundPosition" defaultValue="PageBuilderBackgroundPosition_TopLeft"/>
19+
<argument name="backgroundSize" defaultValue="PageBuilderBackgroundSize_Cover"/>
20+
<argument name="backgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Disabled"/>
21+
<argument name="backgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Scroll"/>
2222
</arguments>
2323
<waitForElementVisible selector="{{page.base(index)}}" stepKey="waitForRow"/>
2424
<waitForElementVisible selector="{{page.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>

‎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/BackgroundFormData.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<data key="section">background</data>
2525
<data key="fieldName">background_color</data>
2626
<data key="value"/>
27+
<data key="stageValue">rgb(250, 250, 250)</data>
2728
</entity>
2829
<entity name="PageBuilderBackgroundColor_Hex_Grey" type="pagebuilder_row_background_color_property">
2930
<data key="name">Background Color</data>
@@ -43,6 +44,20 @@
4344
<data key="hex">#ffc0cb</data>
4445
<data key="editPanelValue">#ffc0cb</data>
4546
</entity>
47+
<entity name="PageBuilderBackgroundColor_Red" type="pagebuilder_background_color_property">
48+
<data key="name">Background Color</data>
49+
<data key="section">background</data>
50+
<data key="fieldName">background_color</data>
51+
<data key="value">#ff0000</data>
52+
<data key="rgb">rgb(255, 0, 0)</data>
53+
</entity>
54+
<entity name="PageBuilderBackgroundColor_Yellow" type="pagebuilder_background_color_property">
55+
<data key="name">Background Color</data>
56+
<data key="section">background</data>
57+
<data key="fieldName">background_color</data>
58+
<data key="value">#ffff0d</data>
59+
<data key="rgb">rgb(255, 255, 13)</data>
60+
</entity>
4661
<entity name="PageBuilderBackgroundColor_Plaintext_Green" type="pagebuilder_background_color_property">
4762
<data key="name">Background Color</data>
4863
<data key="section">background</data>
@@ -139,6 +154,19 @@
139154
<data key="value">invalid</data>
140155
<data key="errorMessage">Wrong color format. Please specify color in HEX, RGBa, HSVa, HSLa or use color name.</data>
141156
</entity>
157+
<!-- Background Type -->
158+
<entity name="PageBuilderBackgroundType_Image" type="pagebuilder_background_type_property">
159+
<data key="name">Background Type</data>
160+
<data key="section">background</data>
161+
<data key="fieldName">background_type</data>
162+
<data key="value">image</data>
163+
</entity>
164+
<entity name="PageBuilderBackgroundType_Video" type="pagebuilder_background_type_property">
165+
<data key="name">Background Type</data>
166+
<data key="section">background</data>
167+
<data key="fieldName">background_type</data>
168+
<data key="value">video</data>
169+
</entity>
142170
<!-- Background Image -->
143171
<entity name="PageBuilderBackgroundImage_Default" type="pagebuilder_background_image_property">
144172
<data key="name">Background Image</data>

‎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: 9 additions & 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">
@@ -67,6 +68,14 @@
6768
<data key="intValue">200</data>
6869
<data key="style">min-height: 200px</data>
6970
</entity>
71+
<entity name="PageBuilderMinHeightProperty_100px" type="pagebuilder_min_height_property">
72+
<data key="name">Minimum Height</data>
73+
<data key="section">appearance_fieldset</data>
74+
<data key="fieldName">min_height</data>
75+
<data key="value">100px</data>
76+
<data key="intValue">100</data>
77+
<data key="style">min-height: 100px</data>
78+
</entity>
7079
<entity name="PageBuilderMinHeightProperty_100vh" type="pagebuilder_min_height_property">
7180
<data key="name">Minimum Height</data>
7281
<data key="section">appearance_fieldset</data>

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

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,78 +32,65 @@
3232
<data key="warningMessage">Full Bleed appearance will work only with supported layouts.</data>
3333
</entity>
3434
<!-- Background Color -->
35-
<entity name="PageBuilderRowBackgroundColor_Yellow" type="pagebuilder_row_background_color_property">
35+
<entity name="PageBuilderRowBackgroundColor_Yellow" type="pagebuilder_row_background_color_property" deprecated="Use PageBuilderBackgroundColor_Yellow instead. To be removed in PB-413">
3636
<data key="name">Background Color</data>
3737
<data key="section">background</data>
3838
<data key="fieldName">background_color</data>
3939
<data key="value">#ffff0d</data>
4040
<data key="rgb">rgb(255, 255, 13)</data>
4141
</entity>
42-
<entity name="PageBuilderRowBackgroundColor_CCCCCC" type="pagebuilder_row_background_color_property">
42+
<entity name="PageBuilderRowBackgroundColor_CCCCCC" type="pagebuilder_row_background_color_property" deprecated="Use PageBuilderBackgroundColor_Hex_Grey instead. To be removed in PB-413">
4343
<data key="name">Background Color</data>
4444
<data key="section">background</data>
4545
<data key="fieldName">background_color</data>
4646
<data key="value">#cccccc</data>
4747
<data key="rgb">rgb(204, 204, 204)</data>
4848
</entity>
49-
<entity name="PageBuilderRowBackgroundColor_FF0000" type="pagebuilder_row_background_color_property">
49+
<entity name="PageBuilderRowBackgroundColor_FF0000" type="pagebuilder_row_background_color_property" deprecated="Use PageBuilderBackgroundColor_Red instead. To be removed in PB-413">
5050
<data key="name">Background Color</data>
5151
<data key="section">background</data>
5252
<data key="fieldName">background_color</data>
5353
<data key="value">#ff0000</data>
5454
<data key="rgb">rgb(255, 0, 0)</data>
5555
</entity>
56-
<!-- Background Type -->
57-
<entity name="PageBuilderRowBackgroundType_Image" type="pagebuilder_row_background_type_property">
58-
<data key="name">Background Type</data>
59-
<data key="section">background</data>
60-
<data key="fieldName">background_type</data>
61-
<data key="value">image</data>
62-
</entity>
63-
<entity name="PageBuilderRowBackgroundType_Video" type="pagebuilder_row_background_type_property">
64-
<data key="name">Background Type</data>
65-
<data key="section">background</data>
66-
<data key="fieldName">background_type</data>
67-
<data key="value">video</data>
68-
</entity>
6956
<!-- Background Image -->
70-
<entity name="PageBuilderRowBackgroundImage_Default" type="pagebuilder_row_background_image_property">
57+
<entity name="PageBuilderRowBackgroundImage_Default" type="pagebuilder_row_background_image_property" deprecated="Use PageBuilderBackgroundImage_Default instead. To be removed in PB-413">
7158
<data key="name">Background Image</data>
7259
<data key="section">background</data>
7360
<data key="fieldName">background_image</data>
7461
</entity>
7562
<!-- Background Position -->
76-
<entity name="PageBuilderRowBackgroundPosition_Default" type="pagebuilder_row_background_position_property">
63+
<entity name="PageBuilderRowBackgroundPosition_Default" type="pagebuilder_row_background_position_property" deprecated="Use PageBuilderBackgroundPosition_TopLeft instead. To be removed in PB-413">
7764
<data key="name">Background Position</data>
7865
<data key="section">background</data>
7966
<data key="fieldName">background_position</data>
8067
<data key="value">Top Aligned</data>
8168
<data key="styleValue">left top</data>
8269
</entity>
8370
<!-- Background Size -->
84-
<entity name="PageBuilderRowBackgroundSize_Default" type="pagebuilder_row_background_size_property">
71+
<entity name="PageBuilderRowBackgroundSize_Default" type="pagebuilder_row_background_size_property" deprecated="Use PageBuilderBackgroundSize_Cover instead. To be removed in PB-413">
8572
<data key="name">Background Size</data>
8673
<data key="section">background</data>
8774
<data key="fieldName">background_size</data>
8875
<data key="value">cover</data>
8976
</entity>
9077
<!-- Background Repeat -->
91-
<entity name="PageBuilderRowBackgroundRepeat_Default" type="pagebuilder_row_background_repeat_property">
78+
<entity name="PageBuilderRowBackgroundRepeat_Default" type="pagebuilder_row_background_repeat_property" deprecated="Use PageBuilderBackgroundRepeat_Disabled instead. To be removed in PB-413">
9279
<data key="name">Background Repeat</data>
9380
<data key="section">background</data>
9481
<data key="fieldName">background_repeat</data>
9582
<data key="value">0</data>
9683
<data key="styleValue">no-repeat</data>
9784
</entity>
9885
<!-- Background Attachment -->
99-
<entity name="PageBuilderRowBackgroundAttachment_Default" type="pagebuilder_row_background_attachment_property">
86+
<entity name="PageBuilderRowBackgroundAttachment_Default" type="pagebuilder_row_background_attachment_property" deprecated="Use PageBuilderBackgroundAttachment_Scroll instead. To be removed in PB-413">
10087
<data key="name">Background Attachment</data>
10188
<data key="section">background</data>
10289
<data key="fieldName">background_attachment</data>
10390
<data key="value">scroll</data>
10491
</entity>
10592
<!-- Parallax Enabled -->
106-
<entity name="PageBuilderRowParallax_Default" type="pagebuilder_row_parallax_property">
93+
<entity name="PageBuilderRowParallax_Default" type="pagebuilder_row_parallax_property" deprecated="Use PageBuilderRowParallax_Disabled instead. To be removed in PB-413">
10794
<data key="name">Enable Parallax Background</data>
10895
<data key="section">parallax_background</data>
10996
<data key="fieldName">enable_parallax</data>
@@ -122,7 +109,14 @@
122109
<data key="value">1</data>
123110
</entity>
124111
<!-- Parallax Speed -->
125-
<entity name="PageBuilderRowParallaxSpeed_Default" type="pagebuilder_row_parallax_speed_property">
112+
<entity name="PageBuilderRowParallaxSpeed_Default" type="pagebuilder_row_parallax_speed_property" deprecated="Use PageBuilderRowParallaxSpeed_0_5 instead. To be removed in PB-413">
113+
<data key="name">Parallax Speed</data>
114+
<data key="section">parallax_background</data>
115+
<data key="fieldName">parallax_speed</data>
116+
<data key="value">0.5</data>
117+
<data key="notice">Enter fractional number from -1.0 to 2.0.</data>
118+
</entity>
119+
<entity name="PageBuilderRowParallaxSpeed_0_5" type="pagebuilder_row_parallax_speed_property">
126120
<data key="name">Parallax Speed</data>
127121
<data key="section">parallax_background</data>
128122
<data key="fieldName">parallax_speed</data>

0 commit comments

Comments
 (0)