Skip to content

Commit bb9fa8e

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'MC-913-Explicit-Background-Attributes-for-Tab' into cms-team-1-delivery
2 parents 9e90e46 + a24e920 commit bb9fa8e

File tree

14 files changed

+812
-719
lines changed

14 files changed

+812
-719
lines changed

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,44 @@
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="validateBackgroundAttributes">
67+
<arguments>
68+
<argument name="section"/>
69+
<argument name="backgroundImage"/>
70+
<argument name="backgroundColor"/>
71+
<argument name="backgroundPosition" defaultValue="PageBuilderBackgroundPosition_Default"/>
72+
<argument name="backgroundSize" defaultValue="PageBuilderBackgroundSize_Default"/>
73+
<argument name="backgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Default"/>
74+
<argument name="backgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Default"/>
75+
<argument name="index" defaultValue="1" type="string"/>
76+
</arguments>
77+
<comment userInput="validateBackgroundAttributesWithNoImage" stepKey="comment"/>
78+
<waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
79+
<waitForElementVisible selector="{{section.backgroundColor(index, backgroundColor.rgb)}}" stepKey="waitForBackgroundColor"/>
80+
<waitForElementVisible selector="{{section.backgroundImage(index, backgroundImage.fileName)}}" stepKey="waitForBackgroundImage"/>
81+
<waitForElementVisible selector="{{section.backgroundPosition(index, backgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
82+
<waitForElementVisible selector="{{section.backgroundSize(index, backgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
83+
<waitForElementVisible selector="{{section.backgroundRepeat(index, backgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
84+
<waitForElementVisible selector="{{section.backgroundAttachment(index, backgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
85+
</actionGroup>
86+
<actionGroup name="validateMobileBackgroundAttributesWithNoImageOrColor">
87+
<arguments>
88+
<argument name="section"/>
89+
<argument name="mobileBackgroundPosition" defaultValue="PageBuilderBackgroundPosition_Default"/>
90+
<argument name="mobileBackgroundSize" defaultValue="PageBuilderBackgroundSize_Default"/>
91+
<argument name="mobileBackgroundRepeat" defaultValue="PageBuilderBackgroundRepeat_Default"/>
92+
<argument name="mobileBackgroundAttachment" defaultValue="PageBuilderBackgroundAttachment_Default"/>
93+
<argument name="index" defaultValue="1" type="string"/>
94+
</arguments>
95+
<comment userInput="validateMobileBackgroundAttributesWithNoImageOrColor" stepKey="comment"/>
96+
<waitForElementVisible selector="{{section.base(index)}}" stepKey="waitForBaseElement"/>
97+
<waitForElementVisible selector="{{section.noMobileBackgroundColor(index)}}" stepKey="waitForBackgroundColor"/>
98+
<waitForElementVisible selector="{{section.noMobileBackgroundImage(index)}}" stepKey="waitForBackgroundImage"/>
99+
<waitForElementVisible selector="{{section.mobileBackgroundPosition(index, mobileBackgroundPosition.styleValue)}}" stepKey="waitForBackgroundPosition"/>
100+
<waitForElementVisible selector="{{section.mobileBackgroundSize(index, mobileBackgroundSize.value)}}" stepKey="waitForBackgroundSize"/>
101+
<waitForElementVisible selector="{{section.mobileBackgroundRepeat(index, mobileBackgroundRepeat.styleValue)}}" stepKey="waitForBackgroundRepeat"/>
102+
<waitForElementVisible selector="{{section.mobileBackgroundAttachment(index, mobileBackgroundAttachment.value)}}" stepKey="waitForBackgroundAttachment"/>
103+
</actionGroup>
66104
<actionGroup name="validateMobileBackgroundAttributes">
67105
<arguments>
68106
<argument name="section"/>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@
2424
<data key="fieldName">background_color</data>
2525
<data key="value"/>
2626
</entity>
27+
<entity name="PageBuilderBackgroundColor_Hex_Grey" type="pagebuilder_row_background_color_property">
28+
<data key="name">Background Color</data>
29+
<data key="section">background</data>
30+
<data key="fieldName">background_color</data>
31+
<data key="value">#cccccc</data>
32+
<data key="rgb">rgb(204, 204, 204)</data>
33+
<data key="hex">#cccccc</data>
34+
<data key="editPanelValue">#cccccc</data>
35+
</entity>
36+
<entity name="PageBuilderBackgroundColor_Pink" type="pagebuilder_row_background_color_property">
37+
<data key="name">Background Color</data>
38+
<data key="section">background</data>
39+
<data key="fieldName">background_color</data>
40+
<data key="value">#ffc0cb</data>
41+
<data key="rgb">rgb(255, 192, 203)</data>
42+
<data key="hex">#ffc0cb</data>
43+
<data key="editPanelValue">#ffc0cb</data>
44+
</entity>
2745
<entity name="PageBuilderBackgroundColor_Plaintext_Green" type="pagebuilder_background_color_property">
2846
<data key="name">Background Color</data>
2947
<data key="section">background</data>
@@ -118,6 +136,15 @@
118136
<data key="extension">jpg</data>
119137
<data key="path">wysiwyg</data>
120138
</entity>
139+
<entity name="PageBuilderBackgroundImage3" type="pagebuilder_background_image_property">
140+
<data key="name">Background Image</data>
141+
<data key="section">background</data>
142+
<data key="fieldName">background_image</data>
143+
<data key="value">magento3.jpg</data>
144+
<data key="fileName">magento3</data>
145+
<data key="extension">jpg</data>
146+
<data key="path">wysiwyg/magento3</data>
147+
</entity>
121148
<entity name="PageBuilderBackgroundImageRoot_JPG" type="pagebuilder_background_image_property">
122149
<data key="name">Background Image</data>
123150
<data key="section">background</data>
@@ -251,6 +278,7 @@
251278
<data key="fieldName">background_position</data>
252279
<data key="value">Top Left</data>
253280
<data key="styleValue">left top</data>
281+
<data key="optionsList">[Top Left, Top Center, Top Right, Center Left, Center, Center Right, Bottom Left, Bottom Center, Bottom Right]</data>
254282
</entity>
255283
<entity name="PageBuilderBackgroundPosition_TopLeft" type="pagebuilder_background_position_property">
256284
<data key="name">Background Position</data>
@@ -368,6 +396,7 @@
368396
<data key="section">background</data>
369397
<data key="fieldName">background_attachment</data>
370398
<data key="value">scroll</data>
399+
<data key="optionsList">[Scroll, Fixed]</data>
371400
</entity>
372401
<entity name="PageBuilderBackgroundAttachment_Scroll" type="pagebuilder_background_attachment_property">
373402
<data key="name">Background Attachment</data>

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

Lines changed: 0 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -70,171 +70,4 @@
7070
<data key="fieldName">min_height</data>
7171
<data key="value">1000</data>
7272
</entity>
73-
<!-- Background image -->
74-
<entity name="PageBuilderTabBackgroundImageProperty" type="pagebuilder_background_image_property">
75-
<data key="name">Background Image</data>
76-
<data key="section">background</data>
77-
<data key="fieldName">background_image</data>
78-
<data key="value">magento.jpg</data>
79-
<data key="fileName">magento</data>
80-
<data key="extension">jpg</data>
81-
<data key="path">wysiwyg/magento</data>
82-
</entity>
83-
<entity name="PageBuilderTabBackgroundImage2Property" type="pagebuilder_background_image_property">
84-
<data key="name">Background Image</data>
85-
<data key="section">background</data>
86-
<data key="fieldName">background_image</data>
87-
<data key="value">magento2.jpg</data>
88-
<data key="fileName">magento</data>
89-
<data key="extension">jpg</data>
90-
<data key="path">wysiwyg/magento2</data>
91-
</entity>
92-
<entity name="PageBuilderTabBackgroundImage3Property" type="pagebuilder_background_image_property">
93-
<data key="name">Background Image</data>
94-
<data key="section">background</data>
95-
<data key="fieldName">background_image</data>
96-
<data key="value">magento3.jpg</data>
97-
<data key="fileName">magento3</data>
98-
<data key="extension">jpg</data>
99-
<data key="path">wysiwyg/magento3</data>
100-
</entity>
101-
<entity name="PageBuilderTabBackgroundImagePngProperty" type="pagebuilder_background_image_property">
102-
<data key="name">Background Image</data>
103-
<data key="section">background</data>
104-
<data key="fieldName">background_image</data>
105-
<data key="value">magento-logo.png</data>
106-
<data key="fileName">magento-logo</data>
107-
<data key="extension">png</data>
108-
<data key="path">wysiwyg</data>
109-
</entity>
110-
<entity name="PageBuilderTabImageGifProperty" type="pagebuilder_background_image_property">
111-
<data key="name">Background Image</data>
112-
<data key="section">background</data>
113-
<data key="fieldName">background_image</data>
114-
<data key="value">m-logo.gif</data>
115-
<data key="extension">gif</data>
116-
<data key="path">wysiwyg/m-logo</data>
117-
</entity>
118-
<!-- Background Mobile image -->
119-
<entity name="PageBuilderTabMobileImageProperty" type="pagebuilder_background_image_property">
120-
<data key="name">Background Mobile Image</data>
121-
<data key="section">background</data>
122-
<data key="fieldName">mobile_image</data>
123-
<data key="value">m-logo.gif</data>
124-
<data key="extension">gif</data>
125-
<data key="path">wysiwyg/m-logo</data>
126-
</entity>
127-
<!-- Background Color -->
128-
<entity name="PageBuilderTabBackgroundColorProperty" type="pagebuilder_row_background_color_property">
129-
<data key="name">Background Color</data>
130-
<data key="section">background</data>
131-
<data key="fieldName">background_color</data>
132-
<data key="value">#cccccc</data>
133-
<data key="rgb">rgb(204, 204, 204)</data>
134-
</entity>
135-
<entity name="PageBuilderTabBackgroundColorPink" type="pagebuilder_row_background_color_property">
136-
<data key="name">Background Color</data>
137-
<data key="section">background</data>
138-
<data key="fieldName">background_color</data>
139-
<data key="value">#ffc0cb</data>
140-
<data key="rgb">rgb(255, 192, 203)</data>
141-
</entity>
142-
<entity name="PageBuilderTabBackgroundColorGreen" type="pagebuilder_row_background_color_property">
143-
<data key="name">Background Color</data>
144-
<data key="section">background</data>
145-
<data key="fieldName">background_color</data>
146-
<data key="value">#228B22</data>
147-
<data key="rgb">rgb(34, 139, 34)</data>
148-
</entity>
149-
<!-- Background Position -->
150-
<entity name="PageBuilderTabBackgroundPositionDefault" type="pagebuilder_tab_property">
151-
<data key="name">Background Position</data>
152-
<data key="section">background</data>
153-
<data key="fieldName">background_position</data>
154-
<data key="value">Top Aligned</data>
155-
<data key="style">left top</data>
156-
<data key="optionsList">[Top Aligned, Centered, Bottom Aligned]</data>
157-
</entity>
158-
<entity name="PageBuilderTabBackgroundPositionTop" type="pagebuilder_tab_property">
159-
<data key="name">Background Position</data>
160-
<data key="section">background</data>
161-
<data key="fieldName">background_position</data>
162-
<data key="value">Top Aligned</data>
163-
<data key="style">left top</data>
164-
</entity>
165-
<entity name="PageBuilderTabBackgroundPositionCentered" type="pagebuilder_tab_property">
166-
<data key="name">Background Position</data>
167-
<data key="section">background</data>
168-
<data key="fieldName">background_position</data>
169-
<data key="value">Centered</data>
170-
<data key="style">center center</data>
171-
</entity>
172-
<entity name="PageBuilderTabBackgroundPositionBottom" type="pagebuilder_tab_property">
173-
<data key="name">Background Position</data>
174-
<data key="section">background</data>
175-
<data key="fieldName">background_position</data>
176-
<data key="value">Bottom Aligned</data>
177-
<data key="style">left bottom</data>
178-
</entity>
179-
<!-- Background Size -->
180-
<entity name="PageBuilderTabBackgroundSizeDefault" type="pagebuilder_tab_property">
181-
<data key="name">Background Size</data>
182-
<data key="section">background</data>
183-
<data key="fieldName">background_size</data>
184-
<data key="value">cover</data>
185-
<data key="optionsList">[Auto, Cover, Contain]</data>
186-
</entity>
187-
<entity name="PageBuilderTabBackgroundSizeCover" type="pagebuilder_tab_property">
188-
<data key="name">Background Size</data>
189-
<data key="section">background</data>
190-
<data key="fieldName">background_size</data>
191-
<data key="value">cover</data>
192-
</entity>
193-
<entity name="PageBuilderTabBackgroundSizeAuto" type="pagebuilder_tab_property">
194-
<data key="name">Background Size</data>
195-
<data key="section">background</data>
196-
<data key="fieldName">background_size</data>
197-
<data key="value">auto</data>
198-
</entity>
199-
<entity name="PageBuilderTabBackgroundSizeContain" type="pagebuilder_tab_property">
200-
<data key="name">Background Size</data>
201-
<data key="section">background</data>
202-
<data key="fieldName">background_size</data>
203-
<data key="value">contain</data>
204-
</entity>
205-
<!-- Background Repeat -->
206-
<entity name="PageBuilderTabBackgroundRepeatYes" type="pagebuilder_tab_property">
207-
<data key="name">Background Repeat</data>
208-
<data key="section">background</data>
209-
<data key="fieldName">background_repeat</data>
210-
<data key="value">1</data>
211-
<data key="style">repeat</data>
212-
</entity>
213-
<entity name="PageBuilderTabBackgroundRepeatNo" type="pagebuilder_tab_property">
214-
<data key="name">Background Repeat</data>
215-
<data key="section">background</data>
216-
<data key="fieldName">background_repeat</data>
217-
<data key="value">0</data>
218-
<data key="style">no-repeat</data>
219-
</entity>
220-
<!-- Background Attachment -->
221-
<entity name="PageBuilderTabBackgroundAttachmentDefault" type="pagebuilder_tab_property">
222-
<data key="name">Background Attachment</data>
223-
<data key="section">background</data>
224-
<data key="fieldName">background_attachment</data>
225-
<data key="value">scroll</data>
226-
<data key="optionsList">[Scroll, Fixed]</data>
227-
</entity>
228-
<entity name="PageBuilderTabBackgroundAttachmentScroll" type="pagebuilder_tab_property">
229-
<data key="name">Background Attachment</data>
230-
<data key="section">background</data>
231-
<data key="fieldName">background_attachment</data>
232-
<data key="value">scroll</data>
233-
</entity>
234-
<entity name="PageBuilderTabBackgroundAttachmentFixed" type="pagebuilder_tab_property">
235-
<data key="name">Background Attachment</data>
236-
<data key="section">background</data>
237-
<data key="fieldName">background_attachment</data>
238-
<data key="value">fixed</data>
239-
</entity>
24073
</entities>

0 commit comments

Comments
 (0)