Skip to content

Commit 49e8833

Browse files
cspruiellcspruiell
committed
MC-1047: Fixed background images are broken in collage appearances
 - refactor configuration form and removed slide selectors for background attributes
1 parent a984349 commit 49e8833

9 files changed

+143
-410
lines changed

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

Lines changed: 0 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,6 @@
1414
<data key="fieldName">slide_name</data>
1515
<data key="value">Slide 1 Name</data>
1616
</entity>
17-
<entity name="PageBuilderSliderBackgroundImageProperty" type="pagebuilder_background_image_property">
18-
<data key="name">Background Image</data>
19-
<data key="section">background</data>
20-
<data key="fieldName">background_image</data>
21-
<data key="value">magento3.jpg</data>
22-
<data key="fileName">magento3</data>
23-
<data key="extension">jpg</data>
24-
<data key="path">wysiwyg/magento</data>
25-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
26-
</entity>
2717
<entity name="PageBuilderSlideMinHeight" type="pagebuilder_slide_property">
2818
<data key="name">Minimum Height</data>
2919
<data key="section">appearance_fieldset</data>
@@ -61,30 +51,6 @@
6151
<data key="fieldName">overlay_color</data>
6252
<data key="value">0</data>
6353
</entity>
64-
<entity name="PageBuilderBackgroundRepeatOff" type="pagebuilder_slide_property">
65-
<data key="name">Background Repeat</data>
66-
<data key="section">background</data>
67-
<data key="fieldName">background_repeat</data>
68-
<data key="value">0</data>
69-
</entity>
70-
<entity name="PageBuilderBackgroundPositionDefault" type="pagebuilder_slide_property">
71-
<data key="name">Background Position</data>
72-
<data key="section">background</data>
73-
<data key="fieldName">background_position</data>
74-
<data key="value">Top Left</data>
75-
</entity>
76-
<entity name="PageBuilderSlideBackgroundSizeDefault" type="pagebuilder_slide_property">
77-
<data key="name">Background Size</data>
78-
<data key="section">background</data>
79-
<data key="fieldName">background_size</data>
80-
<data key="value">Cover</data>
81-
</entity>
82-
<entity name="PageBuilderSlideBackgroundColorDefault" type="pagebuilder_slide_property">
83-
<data key="name">Background Color</data>
84-
<data key="section">background</data>
85-
<data key="fieldName">background_color</data>
86-
<data key="value">0</data>
87-
</entity>
8854
<entity name="PageBuilderSlideItemContent1" type="pagebuilder_slide_property">
8955
<data key="name">Content</data>
9056
<data key="section">general</data>
@@ -199,57 +165,6 @@
199165
<data key="fieldName">has_overlay_background</data>
200166
<data key="value">0</data>
201167
</entity>
202-
<entity name="PageBuilderSlideBackgroundImageProperty1" type="pagebuilder_background_image_property">
203-
<data key="name">Background Image</data>
204-
<data key="section">background</data>
205-
<data key="fieldName">background_image</data>
206-
<data key="value">magento.jpg</data>
207-
<data key="fileName">magento</data>
208-
<data key="extension">jpg</data>
209-
<data key="path">wysiwyg</data>
210-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
211-
</entity>
212-
<entity name="PageBuilderSlideBackgroundImageProperty2" type="pagebuilder_image_property">
213-
<data key="name">Background Image</data>
214-
<data key="section">background</data>
215-
<data key="fieldName">background_image</data>
216-
<data key="value">magento2.jpg</data>
217-
<data key="fileName">magento2</data>
218-
<data key="extension">jpg</data>
219-
<data key="path">wysiwyg</data>
220-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
221-
</entity>
222-
<entity name="PageBuilderSlideBackgroundImageProperty" type="pagebuilder_background_image_property">
223-
<data key="name">Background Image</data>
224-
<data key="section">background</data>
225-
<data key="fieldName">background_image</data>
226-
<data key="value">magento.jpg</data>
227-
<data key="fileName">magento</data>
228-
<data key="extension">jpg</data>
229-
<data key="path">wysiwyg/magento</data>
230-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
231-
</entity>
232-
<entity name="PageBuilderSlideMobileImageProperty" type="pagebuilder_background_image_property">
233-
<data key="name">Background Mobile Image</data>
234-
<data key="section">background</data>
235-
<data key="fieldName">mobile_image</data>
236-
<data key="value">m-logo.gif</data>
237-
<data key="extension">gif</data>
238-
<data key="path">wysiwyg/m-logo</data>
239-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
240-
</entity>
241-
<entity name="PageBuilderSlideBackgroundSizeProperty" type="pagebuilder_Slide_backgroundSize_property">
242-
<data key="name">Background Size</data>
243-
<data key="section">background</data>
244-
<data key="fieldName">background_size</data>
245-
<data key="value">cover</data>
246-
</entity>
247-
<entity name="PageBuilderSlideBackgroundSizeDefaultProperty" type="pagebuilder_Slide_backgroundSize_property">
248-
<data key="name">Background Size</data>
249-
<data key="section">background</data>
250-
<data key="fieldName">background_size</data>
251-
<data key="value">cover</data>
252-
</entity>
253168
<entity name="PageBuilderSlideShowButtonDefaultProperty" type="pagebuilder_Slide_showButton_property">
254169
<data key="name">Show Button</data>
255170
<data key="section">general</data>
@@ -453,31 +368,6 @@
453368
<data key="paddingBottom">40</data>
454369
<data key="paddingLeft">40</data>
455370
</entity>
456-
<entity name="PageBuilderSlideWhiteBackgroundColorProperty" type="pagebuilder_Slide_background_color_property">
457-
<data key="name">Background Color</data>
458-
<data key="section">background</data>
459-
<data key="fieldName">background_color</data>
460-
<data key="value">rgb(255, 255, 255)</data>
461-
<data key="editPanelValue">#ffffff</data>
462-
</entity>
463-
<entity name="PageBuilderSlideBackgroundPositionDefaultProperty" type="pagebuilder_Slide_background_position_property">
464-
<data key="name">Background Position</data>
465-
<data key="section">background</data>
466-
<data key="fieldName">background_position</data>
467-
<data key="value">Top Left</data>
468-
</entity>
469-
<entity name="PageBuilderSlideBackgroundPositionCenteredProperty" type="pagebuilder_Slide_background_position_property">
470-
<data key="name">Background Position</data>
471-
<data key="section">background</data>
472-
<data key="fieldName">background_position</data>
473-
<data key="value">Center</data>
474-
</entity>
475-
<entity name="PageBuilderSlideBackgroundRepeatDefaultProperty" type="pagebuilder_Slide_background_repeat_property">
476-
<data key="name">Background Repeat</data>
477-
<data key="section">background</data>
478-
<data key="fieldName">background_repeat</data>
479-
<data key="value">0</data>
480-
</entity>
481371
<entity name="PageBuilderSlideWhiteOverlayColorProperty" type="pagebuilder_Slide_overlay_color_property">
482372
<data key="name">Overlay Color</data>
483373
<data key="section">general</data>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,11 @@
489489
<actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeDefaultMinimumHeightProperty">
490490
<argument name="property" value="PageBuilderBannerMinimumHeightDefaultProperty"/>
491491
</actionGroup>
492+
<grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundPositionDropdownValues"/>
493+
<assertEquals stepKey="assertPositionDropdown" message="Background Position in dropdown">
494+
<expectedResult type="array">{{PageBuilderBackgroundPosition_Default.optionsList}}</expectedResult>
495+
<actualResult type="variable">grabBackgroundPositionDropdownValues</actualResult>
496+
</assertEquals>
492497
<actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="seeDefaultBackgroundPositionProperty">
493498
<argument name="property" value="PageBuilderBackgroundPosition_Default"/>
494499
</actionGroup>

0 commit comments

Comments
 (0)