Skip to content

Commit 7a4f39f

Browse files
dhaeckerdhaecker
committed
MC-3228: Add Missing P0-P1 MFTF Tests For Slider
- Fixing slide background selectors - Removing slide background data - Updating affected tests - Fixing slide background default value test - Including background checks in slide all attribute tests
1 parent ac18aef commit 7a4f39f

8 files changed

+202
-266
lines changed

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

Lines changed: 0 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -41,142 +41,6 @@
4141
<data key="fieldName">min_height</data>
4242
<data key="value">300</data>
4343
</entity>
44-
<!-- Background Data -->
45-
<!--todo: delete background data-->
46-
<entity name="PageBuilderSliderBackgroundImageProperty" type="pagebuilder_background_image_property">
47-
<data key="name">Background Image</data>
48-
<data key="section">background</data>
49-
<data key="fieldName">background_image</data>
50-
<data key="value">magento3.jpg</data>
51-
<data key="fileName">magento3</data>
52-
<data key="extension">jpg</data>
53-
<data key="path">wysiwyg/magento</data>
54-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
55-
</entity>
56-
<entity name="PageBuilderSlideBackgroundImageProperty1" type="pagebuilder_background_image_property">
57-
<data key="name">Background Image</data>
58-
<data key="section">background</data>
59-
<data key="fieldName">background_image</data>
60-
<data key="value">magento.jpg</data>
61-
<data key="fileName">magento</data>
62-
<data key="extension">jpg</data>
63-
<data key="path">wysiwyg</data>
64-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
65-
</entity>
66-
<entity name="PageBuilderSlideBackgroundImageProperty2" type="pagebuilder_image_property">
67-
<data key="name">Background Image</data>
68-
<data key="section">background</data>
69-
<data key="fieldName">background_image</data>
70-
<data key="value">magento2.jpg</data>
71-
<data key="fileName">magento2</data>
72-
<data key="extension">jpg</data>
73-
<data key="path">wysiwyg</data>
74-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
75-
</entity>
76-
<entity name="PageBuilderSlideBackgroundImageProperty" type="pagebuilder_background_image_property">
77-
<data key="name">Background Image</data>
78-
<data key="section">background</data>
79-
<data key="fieldName">background_image</data>
80-
<data key="value">magento.jpg</data>
81-
<data key="fileName">magento</data>
82-
<data key="extension">jpg</data>
83-
<data key="path">wysiwyg/magento</data>
84-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
85-
</entity>
86-
<entity name="PageBuilderSlideMobileImageProperty" type="pagebuilder_background_image_property">
87-
<data key="name">Background Mobile Image</data>
88-
<data key="section">background</data>
89-
<data key="fieldName">mobile_image</data>
90-
<data key="value">m-logo.gif</data>
91-
<data key="extension">gif</data>
92-
<data key="path">wysiwyg/m-logo</data>
93-
<data key="url">/(\b(https?|ftp|file):\/\/)[-A-Za-z0-9+&amp;@#/%?=~_|!:,.;]+[-A-Za-z0-9+&amp;@#/%=~_|]/g</data>
94-
</entity>
95-
<entity name="PageBuilderBackgroundRepeatOff" type="pagebuilder_slide_property">
96-
<data key="name">Background Repeat</data>
97-
<data key="section">background</data>
98-
<data key="fieldName">background_repeat</data>
99-
<data key="value">0</data>
100-
</entity>
101-
<entity name="PageBuilderBackgroundPositionDefault" type="pagebuilder_slide_property">
102-
<data key="name">Background Position</data>
103-
<data key="section">background</data>
104-
<data key="fieldName">background_position</data>
105-
<data key="value">Top Aligned</data>
106-
</entity>
107-
<entity name="PageBuilderSlideBackgroundSizeDefault" type="pagebuilder_slide_property">
108-
<data key="name">Background Size</data>
109-
<data key="section">background</data>
110-
<data key="fieldName">background_size</data>
111-
<data key="value">Cover</data>
112-
</entity>
113-
<entity name="PageBuilderSlideBackgroundColorDefault" type="pagebuilder_slide_property">
114-
<data key="name">Background Color</data>
115-
<data key="section">background</data>
116-
<data key="fieldName">background_color</data>
117-
<data key="value">0</data>
118-
</entity>
119-
<entity name="PageBuilderSlideBackgroundAttachmentDefault" type="pagebuilder_slide_property">
120-
<data key="name">Background Attachment</data>
121-
<data key="section">background</data>
122-
<data key="fieldName">background_attachment</data>
123-
<data key="value">Scroll</data>
124-
</entity>
125-
<entity name="PageBuilderSlideWhiteBackgroundColorProperty" type="pagebuilder_Slide_background_color_property">
126-
<data key="name">Background Color</data>
127-
<data key="section">background</data>
128-
<data key="fieldName">background_color</data>
129-
<data key="value">rgb(255, 255, 255)</data>
130-
<data key="editPanelValue">#ffffff</data>
131-
</entity>
132-
<entity name="PageBuilderSlideBackgroundPositionDefaultProperty" type="pagebuilder_Slide_background_position_property">
133-
<data key="name">Background Position</data>
134-
<data key="section">background</data>
135-
<data key="fieldName">background_position</data>
136-
<data key="value">Top Aligned</data>
137-
</entity>
138-
<entity name="PageBuilderSlideBackgroundSizeProperty" type="pagebuilder_Slide_backgroundSize_property">
139-
<data key="name">Background Size</data>
140-
<data key="section">background</data>
141-
<data key="fieldName">background_size</data>
142-
<data key="value">cover</data>
143-
</entity>
144-
<entity name="PageBuilderSlideBackgroundSizeDefaultProperty" type="pagebuilder_Slide_backgroundSize_property">
145-
<data key="name">Background Size</data>
146-
<data key="section">background</data>
147-
<data key="fieldName">background_size</data>
148-
<data key="value">cover</data>
149-
</entity>
150-
<entity name="PageBuilderSlideBackgroundPositionCenteredProperty" type="pagebuilder_Slide_background_position_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">Centered</data>
155-
</entity>
156-
<entity name="PageBuilderSlideBackgroundRepeatDefaultProperty" type="pagebuilder_Slide_background_repeat_property">
157-
<data key="name">Background Repeat</data>
158-
<data key="section">background</data>
159-
<data key="fieldName">background_repeat</data>
160-
<data key="value">0</data>
161-
</entity>
162-
<entity name="PageBuilderSlideBackgroundAttachmentDefaultProperty" type="pagebuilder_Slide_background_attach_property">
163-
<data key="name">Background Attachment</data>
164-
<data key="section">background</data>
165-
<data key="fieldName">background_attachment</data>
166-
<data key="value">Scroll</data>
167-
</entity>
168-
<entity name="PageBuilderSlideBackgroundAttachmentScrollProperty" type="pagebuilder_Slide_background_attach_property">
169-
<data key="name">Background Attachment</data>
170-
<data key="section">background</data>
171-
<data key="fieldName">background_attachment</data>
172-
<data key="value">Scroll</data>
173-
</entity>
174-
<entity name="PageBuilderSlideBackgroundAttachmentFixedProperty" type="pagebuilder_Slide_background_attach_property">
175-
<data key="name">Background Attachment</data>
176-
<data key="section">background</data>
177-
<data key="fieldName">background_attachment</data>
178-
<data key="value">Fixed</data>
179-
</entity>
18044
<!-- Link -->
18145
<entity name="PageBuilderSlideItemLinkURL_Empty" type="pagebuilder_slide_item_link_url_property">
18246
<data key="name">Link URL</data>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,32 @@
99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<!-- AutoPlay -->
12-
<entity name="PageBuilderSliderAutoplay_Disabled" type="pagebuilder_slider_autoplay_property">
12+
<entity name="PageBuilderSliderAutoPlay_Disabled" type="pagebuilder_slider_autoplay_property">
1313
<data key="name">Autoplay</data>
1414
<data key="section">settings</data>
1515
<data key="fieldName">autoplay</data>
1616
<data key="value">false</data>
1717
</entity>
18-
<entity name="PageBuilderSliderAutoplay_Enabled" type="pagebuilder_slider_autoplay_property">
18+
<entity name="PageBuilderSliderAutoPlay_Enabled" type="pagebuilder_slider_autoplay_property">
1919
<data key="name">Autoplay</data>
2020
<data key="section">settings</data>
2121
<data key="fieldName">autoplay</data>
2222
<data key="value">true</data>
2323
</entity>
2424
<!-- AutoPlay Speed -->
25-
<entity name="PageBuilderSliderAutoplaySpeed_Default" type="pagebuilder_slider_autoplay_speed_property">
25+
<entity name="PageBuilderSliderAutoPlaySpeed_Default" type="pagebuilder_slider_autoplay_speed_property">
2626
<data key="name">Autoplay Speed</data>
2727
<data key="section">settings</data>
2828
<data key="fieldName">autoplay_speed</data>
2929
<data key="value">4000</data>
3030
</entity>
31-
<entity name="PageBuilderSliderAutoplaySpeed_5000" type="pagebuilder_slider_autoplay_speed_property">
31+
<entity name="PageBuilderSliderAutoPlaySpeed_5000" type="pagebuilder_slider_autoplay_speed_property">
3232
<data key="name">Autoplay Speed</data>
3333
<data key="section">settings</data>
3434
<data key="fieldName">autoplay_speed</data>
3535
<data key="value">5000</data>
3636
</entity>
37-
<entity name="PageBuilderSliderAutoplaySpeed_50000" type="pagebuilder_slider_autoplay_speed_property">
37+
<entity name="PageBuilderSliderAutoPlaySpeed_50000" type="pagebuilder_slider_autoplay_speed_property">
3838
<data key="name">Autoplay Speed</data>
3939
<data key="section">settings</data>
4040
<data key="fieldName">autoplay_speed</data>

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

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@
1111
<section name="SliderOnFrontend">
1212
<element name="all" type="button" selector="div[data-role=slider]"/>
1313
<element name="base" type="button" selector="(//div[@data-role='slider'])[{{arg1}}]" parameterized="true"/>
14-
<element name="hidden" type="button" selector="(//div[@data-role='slider'])[{{arg1}}][contains(@style, 'display: none')]" parameterized="true"/>
15-
<element name="notHidden" type="button" selector="(//div[@data-role='slider'])[{{arg1}}][not(contains(@style, 'display: none'))]" parameterized="true"/>
16-
<element name="SliderDisplay" type="button" selector="div[data-role='slider']"/>
17-
<element name="SliderEmpty" type="button" selector="div[data-role='slider'].slider-empty"/>
14+
<element name="hidden" type="button" selector="(//div[@data-role='slider'])[{{arg1}}][contains(@style,'display: none')]" parameterized="true"/>
15+
<element name="notHidden" type="button" selector="(//div[@data-role='slider'])[{{arg1}}][not(contains(@style,'display: none'))]" parameterized="true"/>
1816
<element name="slideNavigationDot" type="button" selector="((//div[@data-role='slider'])[{{arg1}}]//ul[@class='slick-dots']//button)[{{arg2}}]" parameterized="true"/>
1917
<!-- Settings Configuration -->
2018
<element name="autoPlay" type="button" selector="(//div[@data-role='slider'])[{{arg1}}][@data-autoplay='{{arg2}}']" parameterized="true"/>
@@ -78,19 +76,19 @@
7876
<element name="minimumHeight" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
7977
<element name="mobileMinimumHeight" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
8078
<!-- Background Configuration -->
81-
<element name="backgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
82-
<element name="noBackgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
8379
<element name="backgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
8480
<element name="noBackgroundColor" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-color:'))]" parameterized="true"/>
85-
<element name="mobileBackgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
86-
<!--<element name="mobileNoBackgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>-->
87-
<element name="mobileBackgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
88-
<element name="mobileNoBackgroundColor" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][not(contains(@style,'background-color:'))]" parameterized="true"/>
81+
<element name="backgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
82+
<element name="noBackgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
8983
<element name="backgroundPosition" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
9084
<element name="backgroundSize" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
9185
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
9286
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
9387
<element name="backgroundMobileImage" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
88+
<element name="mobileBackgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
89+
<element name="mobileNoBackgroundColor" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][not(contains(@style,'background-color:'))]" parameterized="true"/>
90+
<element name="mobileBackgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
91+
<element name="mobileNoBackgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
9492
<element name="mobileBackgroundPosition" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
9593
<element name="mobileBackgroundSize" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
9694
<element name="mobileBackgroundRepeat" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='mobile_image'][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
@@ -149,14 +147,14 @@
149147
<element name="posterMinimumHeight" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@class='pagebuilder-slide-wrapper'][contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
150148
<element name="collageMinimumHeight" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'min-height: {{arg2}}px;')]" parameterized="true"/>
151149
<!-- Background Configuration -->
152-
<element name="backgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
153150
<element name="backgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-color: {{arg2}};')]" parameterized="true"/>
154151
<element name="noBackgroundColor" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[not(contains(@style,'background-color:'))]" parameterized="true"/>
155-
<element name="backgroundPosition" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
156-
<element name="backgroundSize" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
157-
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
158-
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
159-
<element name="noBackgroundImage" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='desktop_image'][not(contains(@style,'background-image:'))]" parameterized="true"/>
152+
<element name="backgroundImage" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-image: url(') and contains(@style,'{{arg2}}')]" parameterized="true"/>
153+
<element name="noBackgroundImage" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[not(contains(@style,'background-image:'))]" parameterized="true"/>
154+
<element name="backgroundPosition" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-position: {{arg2}};')]" parameterized="true"/>
155+
<element name="backgroundSize" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-size: {{arg2}};')]" parameterized="true"/>
156+
<element name="backgroundRepeat" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-repeat: {{arg2}};')]" parameterized="true"/>
157+
<element name="backgroundAttachment" type="button" selector="(//div[@data-role='slide'])[{{arg1}}]/div[contains(@style,'background-attachment: {{arg2}};')]" parameterized="true"/>
160158
<!-- Content Configuration -->
161159
<element name="messageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content']//p[text()='{{arg2}}']" parameterized="true"/>
162160
<element name="noMessageContent" type="text" selector="(//div[@data-role='slide'])[{{arg1}}]//div[@data-element='content'][.='Edit Slide Text'][not(*)]" parameterized="true"/>

0 commit comments

Comments
 (0)