Skip to content

Commit 6f007e0

Browse files
krissyhiserotekrissyhiserote
committed
Merge remote-tracking branch 'owls/MC-3239-Add-Missing-P0-P1-MFTF-Tests-For-Banner' into cms-team-2-sprint-13
2 parents bf9d84b + 3d36483 commit 6f007e0

15 files changed

+4019
-2925
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,24 @@
6363
<waitForElementVisible selector="{{section.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
6464
<waitForElementVisible selector="{{section.backgroundAttachment(index, backgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
6565
</actionGroup>
66+
<actionGroup name="validateMobileBackgroundAttributes">
67+
<arguments>
68+
<argument name="section"/>
69+
<argument name="mobileBackgroundColor"/>
70+
<argument name="mobileBackgroundPosition" defaultValue="PageBuilderBackgroundPosition_Default"/>
71+
<argument name="mobileBackgroundSize" defaultValue="PageBuilderBackgroundSize_Default"/>
72+
<argument name="mobileBackgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Default"/>
73+
<argument name="mobileBackgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Default"/>
74+
<argument name="index" defaultValue="1" type="string"/>
75+
</arguments>
76+
<comment userInput="validateMobileBackgroundAttributes" stepKey="comment"/>
77+
<waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
78+
<waitForElementVisible selector="{{section.mobileBackgroundColor(index, mobileBackgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
79+
<waitForElementVisible selector="{{section.mobileBackgroundPosition(index, mobileBackgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
80+
<waitForElementVisible selector="{{section.mobileBackgroundSize(index, mobileBackgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
81+
<waitForElementVisible selector="{{section.mobileBackgroundRepeat(index, mobileBackgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
82+
<waitForElementVisible selector="{{section.mobileBackgroundAttachment(index, mobileBackgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
83+
</actionGroup>
6684
<actionGroup name="validateBackgroundImage">
6785
<arguments>
6886
<argument name="section"/>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
<data key="name">Border Color</data>
129129
<data key="section">advanced</data>
130130
<data key="fieldName">border_color</data>
131+
<data key="value"/>
131132
<data key="placeholderText">No Color</data>
132133
</entity>
133134
<entity name="PageBuilderAdvancedBorderColorProperty_Empty" type="pagebuilder_advanced_border_color_property">
@@ -264,6 +265,7 @@
264265
<data key="name">CSS Classes</data>
265266
<data key="section">advanced</data>
266267
<data key="fieldName">css_classes</data>
268+
<data key="value"/>
267269
</entity>
268270
<entity name="PageBuilderAdvancedCssClassesProperty_Empty" type="pagebuilder_advanced_css_classes_property">
269271
<data key="name">CSS Classes</data>

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

Lines changed: 110 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
<data key="fieldName">appearance</data>
1616
<data key="value">poster</data>
1717
</entity>
18+
<entity name="PageBuilderBannerAppearance_Poster" type="pagebuilder_banner_appearance_property">
19+
<data key="name">Appearance</data>
20+
<data key="section">appearance_fieldset</data>
21+
<data key="fieldName">appearance</data>
22+
<data key="value">poster</data>
23+
</entity>
1824
<entity name="PageBuilderBannerCollageLeftProperty" type="pagebuilder_banner_appearance_property">
1925
<data key="name">Appearance</data>
2026
<data key="section">appearance_fieldset</data>
@@ -48,6 +54,10 @@
4854
</entity>
4955
<!-- Message Text -->
5056
<entity name="PageBuilderBannerMessageDefaultProperty" type="pagebuilder_banner_message_property">
57+
<data key="name">Message Text</data>
58+
<data key="section">contents</data>
59+
<data key="role">textarea</data>
60+
<data key="value"/>
5161
<data key="placeholder">Edit Banner Text</data>
5262
</entity>
5363
<entity name="PageBuilderBannerMessageProperty" type="pagebuilder_banner_message_property">
@@ -90,32 +100,44 @@
90100
<data key="value">true</data>
91101
</entity>
92102
<!-- Show Button -->
93-
<entity name="PageBuilderBannerShowButtonAlwaysProperty" type="pagebuilder_banner_showButton_property">
103+
<entity name="PageBuilderBannerShowButtonDefaultProperty" type="pagebuilder_banner_show_button_property">
94104
<data key="name">Show Button</data>
95105
<data key="section">contents</data>
96106
<data key="fieldName">show_button</data>
97-
<data key="value">always</data>
107+
<data key="value">never</data>
98108
</entity>
99-
<entity name="PageBuilderBannerShowButtonDefaultProperty" type="pagebuilder_banner_showButton_property">
109+
<entity name="PageBuilderBannerShowButtonAlwaysProperty" type="pagebuilder_banner_show_button_property">
100110
<data key="name">Show Button</data>
101111
<data key="section">contents</data>
102112
<data key="fieldName">show_button</data>
103-
<data key="value">never</data>
113+
<data key="value">always</data>
104114
</entity>
105-
<entity name="PageBuilderBannerShowButtonOnHoverProperty" type="pagebuilder_banner_showButton_property">
115+
<entity name="PageBuilderBannerShowButtonOnHoverProperty" type="pagebuilder_banner_show_button_property">
106116
<data key="name">Show Button</data>
107117
<data key="section">contents</data>
108118
<data key="fieldName">show_button</data>
109119
<data key="value">hover</data>
110120
</entity>
121+
<entity name="PageBuilderBannerShowButtonNeverProperty" type="pagebuilder_banner_show_button_property">
122+
<data key="name">Show Button</data>
123+
<data key="section">contents</data>
124+
<data key="fieldName">show_button</data>
125+
<data key="value">never</data>
126+
</entity>
111127
<!-- Button Text -->
112-
<entity name="PageBuilderBannerButtonTextProperty" type="pagebuilder_banner_buttonText_property">
128+
<entity name="PageBuilderBannerButtonText_Default" type="pagebuilder_banner_button_text_property">
129+
<data key="name">Button Text</data>
130+
<data key="section">contents</data>
131+
<data key="fieldName">button_text</data>
132+
<data key="value"/>
133+
</entity>
134+
<entity name="PageBuilderBannerButtonTextProperty" type="pagebuilder_banner_button_text_property">
113135
<data key="name">Button Text</data>
114136
<data key="section">contents</data>
115137
<data key="fieldName">button_text</data>
116138
<data key="value">Good Morning!</data>
117139
</entity>
118-
<entity name="PageBuilderBannerButtonTextProperty2" type="pagebuilder_banner_buttonText_property2">
140+
<entity name="PageBuilderBannerButtonTextProperty2" type="pagebuilder_banner_button_text_property">
119141
<data key="name">Button Text</data>
120142
<data key="section">contents</data>
121143
<data key="fieldName">button_text</data>
@@ -126,7 +148,7 @@
126148
<data key="name">Button Type</data>
127149
<data key="section">contents</data>
128150
<data key="fieldName">button_type</data>
129-
<data key="value">Primary</data>
151+
<data key="value">pagebuilder-button-primary</data>
130152
<data key="class">true</data>
131153
</entity>
132154
<entity name="PageBuilderBannerButtonTypePrimaryProperty" type="pagebuilder_banner_buttonType_property">
@@ -173,18 +195,27 @@
173195
<data key="value">never</data>
174196
</entity>
175197
<!-- Overlay Color -->
176-
<entity name="PageBuilderBannerContentOverlayColorProperty" type="pagebuilder_banner_contentOverlayColor_property">
198+
<entity name="PageBuilderBannerContentOverlayColorProperty" type="pagebuilder_banner_overlay_color_property">
177199
<data key="name">Overlay Color</data>
178200
<data key="section">contents</data>
179201
<data key="fieldName">overlay_color</data>
180202
<data key="value">#ffffff</data>
203+
<data key="rgb">255, 255, 255</data>
204+
</entity>
205+
<entity name="PageBuilderBannerOverlayColor_FF0000" type="pagebuilder_banner_overlay_color_property">
206+
<data key="name">Overlay Color</data>
207+
<data key="section">contents</data>
208+
<data key="fieldName">overlay_color</data>
209+
<data key="value">#ff0000</data>
210+
<data key="rgb">255, 0, 0</data>
181211
</entity>
182212
<!-- Overlay Transparency -->
183213
<entity name="PageBuilderBannerOverlayTransparencyProperty" type="pagebuilder_banner_overlayTransparency_property">
184214
<data key="name">Overlay Transparency</data>
185215
<data key="section">contents</data>
186216
<data key="fieldName">overlay_transparency</data>
187217
<data key="value">70</data>
218+
<data key="decimal">0.7</data>
188219
</entity>
189220
<entity name="PageBuilderBannerOverlayTransparencyDefaultProperty" type="pagebuilder_banner_overlayTransparencyDefault_property">
190221
<data key="name">Overlay Transparency</data>
@@ -197,17 +228,87 @@
197228
<data key="section">contents</data>
198229
<data key="fieldName">overlay_transparency</data>
199230
<data key="value">-1</data>
231+
<data key="errorMessage">Please enter a value greater than or equal to 0.</data>
200232
</entity>
201233
<entity name="PageBuilderBannerOverlayTransparencyInvalidMaxProperty" type="pagebuilder_banner_overlayTransparency_property">
202234
<data key="name">Overlay Transparency</data>
203235
<data key="section">contents</data>
204236
<data key="fieldName">overlay_transparency</data>
205237
<data key="value">101</data>
238+
<data key="errorMessage">Please enter a value less than or equal to 100.</data>
206239
</entity>
207240
<entity name="PageBuilderBannerOverlayTransparencyInvalidTypeProperty" type="pagebuilder_banner_overlayTransparency_property">
208241
<data key="name">Overlay Transparency</data>
209242
<data key="section">contents</data>
210243
<data key="fieldName">overlay_transparency</data>
211244
<data key="value">abc</data>
245+
<data key="errorMessage">Please enter a valid number in this field.</data>
246+
</entity>
247+
<!-- Padding -->
248+
<entity name="PageBuilderBannerCollageLeftPaddingPropertyDefault" type="pagebuilder_banner_collage_left_padding_property">
249+
<data key="name">Margins and Padding</data>
250+
<data key="section">advanced</data>
251+
<data key="fieldName">margins_and_padding</data>
252+
<data key="paddingTop">40</data>
253+
<data key="paddingRight">40</data>
254+
<data key="paddingBottom">40</data>
255+
<data key="paddingLeft">40</data>
256+
<data key="desktopValue">40px calc(50% + 40px) 40px 40px</data>
257+
<data key="mobileValue">40px 40px 40px 40px</data>
258+
</entity>
259+
<entity name="PageBuilderBannerCollageLeftPaddingPropertyUnique" type="pagebuilder_banner_collage_left_padding_property">
260+
<data key="name">Margins and Padding</data>
261+
<data key="section">advanced</data>
262+
<data key="fieldName">margins_and_padding</data>
263+
<data key="paddingTop">1</data>
264+
<data key="paddingRight">2</data>
265+
<data key="paddingBottom">3</data>
266+
<data key="paddingLeft">4</data>
267+
<data key="desktopValue">1px calc(50% + 2px) 3px 4px</data>
268+
<data key="mobileValue">1px 2px 3px 4px</data>
269+
</entity>
270+
<entity name="PageBuilderBannerCollageCenterPaddingPropertyDefault" type="pagebuilder_banner_collage_center_padding_property">
271+
<data key="name">Margins and Padding</data>
272+
<data key="section">advanced</data>
273+
<data key="fieldName">margins_and_padding</data>
274+
<data key="paddingTop">1</data>
275+
<data key="paddingRight">2</data>
276+
<data key="paddingBottom">3</data>
277+
<data key="paddingLeft">4</data>
278+
<data key="desktopValue">40px calc(25% + 40px)</data>
279+
<data key="mobileValue">40px 40px 40px 40px</data>
280+
</entity>
281+
<entity name="PageBuilderBannerCollageCenterPaddingPropertyUnique" type="pagebuilder_banner_collage_center_padding_property">
282+
<data key="name">Margins and Padding</data>
283+
<data key="section">advanced</data>
284+
<data key="fieldName">margins_and_padding</data>
285+
<data key="paddingTop">1</data>
286+
<data key="paddingRight">2</data>
287+
<data key="paddingBottom">3</data>
288+
<data key="paddingLeft">4</data>
289+
<data key="desktopValue">1px calc(25% + 2px) 3px calc(25% + 4px)</data>
290+
<data key="mobileValue">1px 2px 3px 4px</data>
291+
</entity>
292+
<entity name="PageBuilderBannerCollageRightPaddingPropertyDefault" type="pagebuilder_banner_collage_right_padding_property">
293+
<data key="name">Margins and Padding</data>
294+
<data key="section">advanced</data>
295+
<data key="fieldName">margins_and_padding</data>
296+
<data key="paddingTop">1</data>
297+
<data key="paddingRight">2</data>
298+
<data key="paddingBottom">3</data>
299+
<data key="paddingLeft">4</data>
300+
<data key="desktopValue">40px 40px 40px calc(50% + 40px)</data>
301+
<data key="mobileValue">40px 40px 40px 40px</data>
302+
</entity>
303+
<entity name="PageBuilderBannerCollageRightPaddingPropertyUnique" type="pagebuilder_banner_collage_right_padding_property">
304+
<data key="name">Margins and Padding</data>
305+
<data key="section">advanced</data>
306+
<data key="fieldName">margins_and_padding</data>
307+
<data key="paddingTop">1</data>
308+
<data key="paddingRight">2</data>
309+
<data key="paddingBottom">3</data>
310+
<data key="paddingLeft">4</data>
311+
<data key="desktopValue">1px 2px 3px calc(50% + 4px)</data>
312+
<data key="mobileValue">1px 2px 3px 4px</data>
212313
</entity>
213314
</entities>

0 commit comments

Comments
 (0)