Skip to content

Commit 9ed2053

Browse files
davemacaulaydavemacaulay
committed
Merge branch 'MC-969-slide-attributes' into cms-team-1-delivery
# Conflicts: # dev/tests/static/testsuite/Magento/Test/Integrity/Xml/ExtendsBaseFormTest.php
2 parents bb9fa8e + 2a0e4fa commit 9ed2053

12 files changed

+158
-511
lines changed

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

Lines changed: 0 additions & 134 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,36 +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 Aligned</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>
88-
<entity name="PageBuilderSlideBackgroundAttachmentDefault" type="pagebuilder_slide_property">
89-
<data key="name">Background Attachment</data>
90-
<data key="section">background</data>
91-
<data key="fieldName">background_attachment</data>
92-
<data key="value">Scroll</data>
93-
</entity>
9454
<entity name="PageBuilderSlideItemContent1" type="pagebuilder_slide_property">
9555
<data key="name">Content</data>
9656
<data key="section">general</data>
@@ -205,57 +165,6 @@
205165
<data key="fieldName">has_overlay_background</data>
206166
<data key="value">0</data>
207167
</entity>
208-
<entity name="PageBuilderSlideBackgroundImageProperty1" type="pagebuilder_background_image_property">
209-
<data key="name">Background Image</data>
210-
<data key="section">background</data>
211-
<data key="fieldName">background_image</data>
212-
<data key="value">magento.jpg</data>
213-
<data key="fileName">magento</data>
214-
<data key="extension">jpg</data>
215-
<data key="path">wysiwyg</data>
216-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
217-
</entity>
218-
<entity name="PageBuilderSlideBackgroundImageProperty2" type="pagebuilder_image_property">
219-
<data key="name">Background Image</data>
220-
<data key="section">background</data>
221-
<data key="fieldName">background_image</data>
222-
<data key="value">magento2.jpg</data>
223-
<data key="fileName">magento2</data>
224-
<data key="extension">jpg</data>
225-
<data key="path">wysiwyg</data>
226-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
227-
</entity>
228-
<entity name="PageBuilderSlideBackgroundImageProperty" type="pagebuilder_background_image_property">
229-
<data key="name">Background Image</data>
230-
<data key="section">background</data>
231-
<data key="fieldName">background_image</data>
232-
<data key="value">magento.jpg</data>
233-
<data key="fileName">magento</data>
234-
<data key="extension">jpg</data>
235-
<data key="path">wysiwyg/magento</data>
236-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
237-
</entity>
238-
<entity name="PageBuilderSlideMobileImageProperty" type="pagebuilder_background_image_property">
239-
<data key="name">Background Mobile Image</data>
240-
<data key="section">background</data>
241-
<data key="fieldName">mobile_image</data>
242-
<data key="value">m-logo.gif</data>
243-
<data key="extension">gif</data>
244-
<data key="path">wysiwyg/m-logo</data>
245-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
246-
</entity>
247-
<entity name="PageBuilderSlideBackgroundSizeProperty" 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>
253-
<entity name="PageBuilderSlideBackgroundSizeDefaultProperty" type="pagebuilder_Slide_backgroundSize_property">
254-
<data key="name">Background Size</data>
255-
<data key="section">background</data>
256-
<data key="fieldName">background_size</data>
257-
<data key="value">cover</data>
258-
</entity>
259168
<entity name="PageBuilderSlideShowButtonDefaultProperty" type="pagebuilder_Slide_showButton_property">
260169
<data key="name">Show Button</data>
261170
<data key="section">general</data>
@@ -459,49 +368,6 @@
459368
<data key="paddingBottom">40</data>
460369
<data key="paddingLeft">40</data>
461370
</entity>
462-
<entity name="PageBuilderSlideWhiteBackgroundColorProperty" type="pagebuilder_Slide_background_color_property">
463-
<data key="name">Background Color</data>
464-
<data key="section">background</data>
465-
<data key="fieldName">background_color</data>
466-
<data key="value">rgb(255, 255, 255)</data>
467-
<data key="editPanelValue">#ffffff</data>
468-
</entity>
469-
<entity name="PageBuilderSlideBackgroundPositionDefaultProperty" 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">Top Aligned</data>
474-
</entity>
475-
<entity name="PageBuilderSlideBackgroundPositionCenteredProperty" type="pagebuilder_Slide_background_position_property">
476-
<data key="name">Background Position</data>
477-
<data key="section">background</data>
478-
<data key="fieldName">background_position</data>
479-
<data key="value">Centered</data>
480-
</entity>
481-
<entity name="PageBuilderSlideBackgroundRepeatDefaultProperty" type="pagebuilder_Slide_background_repeat_property">
482-
<data key="name">Background Repeat</data>
483-
<data key="section">background</data>
484-
<data key="fieldName">background_repeat</data>
485-
<data key="value">0</data>
486-
</entity>
487-
<entity name="PageBuilderSlideBackgroundAttachmentDefaultProperty" type="pagebuilder_Slide_background_attach_property">
488-
<data key="name">Background Attachment</data>
489-
<data key="section">background</data>
490-
<data key="fieldName">background_attachment</data>
491-
<data key="value">Scroll</data>
492-
</entity>
493-
<entity name="PageBuilderSlideBackgroundAttachmentScrollProperty" type="pagebuilder_Slide_background_attach_property">
494-
<data key="name">Background Attachment</data>
495-
<data key="section">background</data>
496-
<data key="fieldName">background_attachment</data>
497-
<data key="value">Scroll</data>
498-
</entity>
499-
<entity name="PageBuilderSlideBackgroundAttachmentFixedProperty" type="pagebuilder_Slide_background_attach_property">
500-
<data key="name">Background Attachment</data>
501-
<data key="section">background</data>
502-
<data key="fieldName">background_attachment</data>
503-
<data key="value">Fixed</data>
504-
</entity>
505371
<entity name="PageBuilderSlideWhiteOverlayColorProperty" type="pagebuilder_Slide_overlay_color_property">
506372
<data key="name">Overlay Color</data>
507373
<data key="section">general</data>

‎app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,10 @@
9999
<element name="collageBackgroundPosition" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-position: center center;']"/>
100100
<element name="collageBackgroundSize" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-size: cover;']"/>
101101
<element name="collageBackgroundRepeat" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-repeat: repeat;']"/>
102-
<element name="collageBackgroundAttachment" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='magento'][style*='background-attachment: scroll;']"/>
103102
<element name="collageMobileBackgroundColor" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-color: rgb(255, 255, 255);']"/>
104103
<element name="collageMobileBackgroundPosition" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-position: center center;']"/>
105104
<element name="collageMobileBackgroundSize" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-size: cover;']"/>
106105
<element name="collageMobileBackgroundRepeat" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-repeat: repeat;']"/>
107-
<element name="collageMobileBackgroundAttachment" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo'][style*='background-attachment: scroll;']"/>
108106
<element name="posterMobileWithMobileImage" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='m-logo']"/>
109107
<element name="collageMinHeightMobile" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='min-height: {{arg1}}px'][style*='magento']" parameterized="true"/>
110108
<element name="collageOverlay" type="button" selector=".pagebuilder-overlay[style*='rgba(255, 255, 255, 0.7)']"/>
@@ -160,7 +158,6 @@
160158
<element name="collageBackgroundPosition" type="button" selector="div[style*='magento'][style*='background-position: center center;']"/>
161159
<element name="collageBackgroundSize" type="button" selector="div[style*='magento'][style*='background-size: cover;']"/>
162160
<element name="collageBackgroundRepeat" type="button" selector="div[style*='magento'][style*='background-repeat: repeat;']"/>
163-
<element name="collageBackgroundAttachment" type="button" selector="div[style*='magento'][style*='background-attachment: scroll;']"/>
164161
<element name="collageMargin" type="button" selector="div[style*='1px 2px 3px 4px'][style*='magento']"/>
165162
<element name="collageMinHeight" type="button" selector="div[style*='min-height: {{arg1}}px'][style*='magento']" parameterized="true"/>
166163
<element name="collageAlignment" type="button" selector="div[style*='text-align: center'][style*='magento']"/>

‎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)