Skip to content

Commit 7a104b7

Browse files
davemacaulaydavemacaulay
committed
MAGETWO-89294: Slider Data Separation
- Resolve numerous test issues - Fix values for background repeat - Fix duplication & removal focusing issues
1 parent 6ebd7ec commit 7a104b7

File tree

13 files changed

+175
-133
lines changed

13 files changed

+175
-133
lines changed

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
<element name="Autoplay" type="button" selector="div[data-role='slider'][data-autoplay='{{arg1}}']" parameterized="true"/>
1414
<element name="AutoplaySpeed" type="button" selector=".pagebuilder-slider[data-autoplay-speed='{{arg1}}']" parameterized="true"/>
1515
<element name="Fade" type="button" selector="div[data-role='slider'][data-fade='{{arg1}}']" parameterized="true"/>
16-
<element name="IsInfinite" type="button" selector="div[data-role='slider'][data-is-infinite='{{arg1}}']" parameterized="true"/>
16+
<element name="IsInfinite" type="button" selector="div[data-role='slider'][data-infinite-loop='{{arg1}}']" parameterized="true"/>
1717
<element name="ShowArrows" type="button" selector="div[data-role='slider'][data-show-arrows='{{arg1}}']" parameterized="true"/>
1818
<element name="ShowDots" type="button" selector="div[data-role='slider'][data-show-dots='{{arg1}}']" parameterized="true"/>
1919
<element name="nextSlide" type="button" selector="[data-role='slider'] .slick-next"/>
2020
<element name="slideNavigator" type="button" selector="(//div[@data-role='slider']//button)[{{arg1}}]" parameterized="true"/>
2121
<element name="sliderMinHeight" type="button" selector="div[style*='min-height: {{arg1}}']" parameterized="true"/>
2222
<element name="sliderAlignment" type="button" selector="div[style*='text-align: {{arg1}}']" parameterized="true"/>
23-
<element name="sliderBorderColor" type="button" selector="//div[contains(@style,'border: 10px dotted rgb(0, 128, 0)')]"/>
24-
<element name="sliderBorderStyle" type="button" selector="div[style*='border: {{arg1}}px {{arg2}} {{arg3}}']" parameterized="true"/>
23+
<element name="sliderBorder" type="button" selector="div.pagebuilder-slider[style*='border-width: {{arg1}}px'][style*='border-style: {{arg2}}'][style*='border-color: {{arg3}}']" parameterized="true"/>
2524
<element name="sliderBorderRadiusStyle" type="button" selector="div[style*='border-radius: {{arg1}}']" parameterized="true"/>
2625
<element name="sliderClass" type="button" selector="div[data-role='slider'][class='{{arg1}}']" parameterized="true"/>
2726
<element name="sliderMarginPaddings" type="button" selector="div.pagebuilder-slider[style*='margin: {{arg1}}px; padding: {{arg2}}px;']" parameterized="true"/>
@@ -52,7 +51,7 @@
5251
<element name="ShowDots" type="button" selector="div[data-role='slider'][data-show-dots='{{arg1}}']" parameterized="true"/>
5352
<element name="sliderMinHeight" type="button" selector="div.slider-container[style*='min-height: {{arg1}}']" parameterized="true"/>
5453
<element name="sliderAlignment" type="button" selector="div.slider-container[style*='text-align: {{arg1}}']" parameterized="true"/>
55-
<element name="sliderBorderStyle" type="button" selector="div.slider-container[style*='border: {{arg1}}px {{arg2}} {{arg3}}']" parameterized="true"/>
54+
<element name="sliderBorder" type="button" selector="div.slider-container[style*='border-width: {{arg1}}px'][style*='border-style: {{arg2}}'][style*='border-color: {{arg3}}']" parameterized="true"/>
5655
<element name="sliderBorderRadiusStyle" type="button" selector="div.slider-container[style*='border-radius: {{arg1}}']" parameterized="true"/>
5756
<element name="sliderMarginPaddings" type="button" selector="div.slider-container[style*='margin: {{arg1}}px; padding: {{arg2}}px;']" parameterized="true"/>
5857
<element name="slideWrapper" type="button" selector=".pagebuilder-slide-wrapper"/>
@@ -106,7 +105,7 @@
106105
<element name="collageLeft" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='40px calc(50% + 40px) 40px 40px'][style*='magento']"/>
107106
<element name="collageCentered" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='40px calc(25% + 40px)'][style*='magento']"/>
108107
<element name="collageRight" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='40px 40px 40px calc(50% + 40px)'][style*='magento']"/>
109-
<element name="collageMargin" type="button" selector="div[data-role='slide'][style*='margin: 1px 2px 3px 4px']"/>
108+
<element name="collageMargin" type="button" selector="div[data-role='slide'] .pagebuilder-slide-wrapper[style*='margin: 1px 2px 3px 4px']"/>
110109
<element name="collageMinHeight" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-hidden[style*='min-height: {{arg1}}px'][style*='magento']" parameterized="true"/>
111110
<element name="collageAlignment" type="button" selector="div[data-role='slide'] .pagebuilder-slide-wrapper[style*='text-align: center']"/>
112111
<element name="collageMobileWithoutMobileImage" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='padding: 40px;'][style*='magento']"/>
@@ -126,7 +125,7 @@
126125
<element name="collageMinHeightMobile" type="button" selector="div[data-role='slide'] .pagebuilder-mobile-only[style*='min-height: {{arg1}}px'][style*='magento']" parameterized="true"/>
127126
<element name="collageOverlay" type="button" selector=".pagebuilder-overlay[style*='rgba(255, 255, 255, 0.7)']"/>
128127
<element name="posterOverlay" type="button" selector=".pagebuilder-poster-overlay[style*='rgba(255, 255, 255, 0.7)']"/>
129-
<element name="slideBorderStyle" type="button" selector="div[data-role='slide'][style*='border: {{arg1}}px {{arg2}} {{arg3}}']" parameterized="true"/>
128+
<element name="slideBorderStyle" type="button" selector="div[data-role='slide'][style*='border-width: {{arg1}}px'][style*='border-style: {{arg2}}'][style*='border-color: {{arg3}}']" parameterized="true"/>
130129
<element name="slideBorderRadiusStyle" type="button" selector="div[data-role='slide'][style*='border-radius: {{arg1}}']" parameterized="true"/>
131130
<element name="slideClass" type="button" selector="div[data-role='slide'][class*='{{arg1}}']" parameterized="true"/>
132131
<element name="computedBoxSizing" type="button" selector="return window.getComputedStyle(document.querySelector('[data-role=slide]')).boxSizing"/>
@@ -143,7 +142,7 @@
143142
<element name="slideButtonText" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide-button span" parameterized="true"/>
144143
<element name="slideLinkURL1" type="button" selector="[data-slick-index='0'] .pagebuilder-slide-button[data-link-url='{{arg1}}']" parameterized="true"/>
145144
<element name="slideLinkURL2" type="button" selector="[data-slick-index='1'] .pagebuilder-slide-button[data-link-url='{{arg1}}']" parameterized="true"/>
146-
<element name="slideBackgroundImage" type="text" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide >div[style*='background-image: url'][style*='{{arg2}}'][style*='{{arg3}}']" parameterized="true"/>
145+
<element name="slideBackgroundImage" type="text" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide-wrapper >div[style*='background-image: url'][style*='{{arg2}}'][style*='{{arg3}}']" parameterized="true"/>
147146
<element name="slide" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide" parameterized="true"/>
148147
<element name="backgroundImageSource" type="button" selector="//div[contains(@style, '{{arg1}}')]" parameterized="true"/>
149148
<element name="messageText" type="text" selector="//div/p[text()='{{arg1}}']" parameterized="true"/>
@@ -158,15 +157,15 @@
158157
<element name="paddingLeftInput" type="button" selector="[name='paddingLeft']"/>
159158
<element name="paddingBottomInput" type="button" selector="[name='paddingBottom']"/>
160159
<element name="paddingRightInput" type="button" selector="[name='paddingRight']"/>
161-
<element name="emptyslide" type="button" selector="//div[contains(@class, 'pagebuilder-empty-slide') and text() = 'Edit slide text']"/>
160+
<element name="emptyslide" type="button" selector="//div[contains(@class, 'pagebuilder-empty-slide') and text() = 'Edit Slide Text']"/>
162161
<element name="emptyPoster" type="button" selector=".pagebuilder-slide-wrapper"/>
163-
<element name="poster" type="button" selector=".pagebuilder-slide-wrapper[style*='magento']"/>
162+
<element name="poster" type="button" selector=".pagebuilder-poster-overlay"/>
164163
<element name="backgroundColorOnStage" type="button" selector=".pagebuilder-slide-wrapper[style*='background-color: {{var1}};']" parameterized="true"/>
165-
<element name="posterBackgroundColor" type="button" selector=".pagebuilder-slide-wrapper[style*='magento'][style*='background-color: rgb(255, 255, 255);']"/>
166-
<element name="posterBackgroundPosition" type="button" selector=".pagebuilder-slide-wrapper[style*='magento'][style*='background-position: center center;']"/>
167-
<element name="posterBackgroundSize" type="button" selector=".pagebuilder-slide-wrapper[style*='magento'][style*='background-size: cover;']"/>
168-
<element name="posterBackgroundRepeat" type="button" selector=".pagebuilder-slide-wrapper[style*='magento'][style*='background-repeat: repeat;']"/>
169-
<element name="posterBackgroundAttachment" type="button" selector=".pagebuilder-slide-wrapper[style*='magento'][style*='background-attachment: scroll;']"/>
164+
<element name="posterBackgroundColor" type="button" selector=".pagebuilder-poster-overlay[style*='magento'][style*='background-color: rgb(255, 255, 255);']"/>
165+
<element name="posterBackgroundPosition" type="button" selector=".pagebuilder-poster-overlay[style*='magento'][style*='background-position: center center;']"/>
166+
<element name="posterBackgroundSize" type="button" selector=".pagebuilder-poster-overlay[style*='magento'][style*='background-size: cover;']"/>
167+
<element name="posterBackgroundRepeat" type="button" selector=".pagebuilder-poster-overlay[style*='magento'][style*='background-repeat: repeat;']"/>
168+
<element name="posterBackgroundAttachment" type="button" selector=".pagebuilder-poster-overlay[style*='magento'][style*='background-attachment: scroll;']"/>
170169
<element name="emptyCollageLeft" type="button" selector="div[style*='40px calc(50% + 40px) 40px 40px']"/>
171170
<element name="emptyCollageCentered" type="button" selector="div[style*='40px calc(25% + 40px)']"/>
172171
<element name="emptyCollageRight" type="button" selector="div[style*='40px 40px 40px calc(50% + 40px)']"/>

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,14 @@
165165
<seeElement selector="{{SliderInAdmin.ShowArrows}}" stepKey="verifyArrowsYesOnAdmin"/>
166166
<seeElement selector="{{SliderInAdmin.sliderMinHeight(PageBuilderSliderMinHeight500Property.value)}}" stepKey="verifyMinHeight500OnAdmin"/>
167167
<seeElement selector="{{SliderInAdmin.sliderAlignment(PageBuilderAdvancedAlignmentPropertyLeft.value)}}" stepKey="verifyAlignmentLeftOnAdmin"/>
168-
<seeElement selector="{{SliderInAdmin.sliderBorderStyle(PageBuilderAdvancedBorderWidthProperty10.value, PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="verifyBorderStyleOnAdmin"/>
168+
<seeElement selector="{{SliderInAdmin.sliderBorder(PageBuilderAdvancedBorderWidthProperty10.value, PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="verifyBorderStyleOnAdmin"/>
169169
<seeElement selector="{{SliderInAdmin.sliderBorderRadiusStyle(PageBuilderAdvancedBorderRadiusProperty12.value)}}" stepKey="verifyBorderRadiusStyleOnAdmin"/>
170170
<seeElement selector="{{SliderInAdmin.sliderMarginPaddings(PageBuilderAdvancedMarginsAndPaddingProperty.marginTop, PageBuilderAdvancedMarginsAndPaddingProperty.paddingTop)}}" stepKey="verifySliderMarginPaddingOnAdmin"/>
171171
<comment userInput="Validate slide 1 on stage" stepKey="commentValidateSlide1Stage"/>
172172
<dontSee userInput="{{PageBuilderSlideItemName1.value}}" selector="{{SlideOnBackend.slideName('0')}}" stepKey="dontSeeSlide1NameDisplayedOnStage"/>
173173
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlide1ContentDisplayedAdmin"/>
174174
<see userInput="{{PageBuilderSlideItemButtonText1.value}}" selector="{{SlideOnBackend.slideButtonText('0')}}" stepKey="seeSlide1ButtonTextDisplayedAdmin"/>
175175
<seeElement selector="{{SlideOnBackend.slideAppearancePoster('0')}}" stepKey="verifySlide1HasPosterAppearance"/>
176-
<seeElement selector="{{SlideOnBackend.slideLinkURL1(PageBuilderSlideItemLinkURL1.value)}}" stepKey="seeSlide1LinkURLAdmin"/>
177176
<seeElement selector="{{SlideOnBackend.slideBackgroundImage('0',PageBuilderSlideBackgroundImageProperty1.path, PageBuilderSlideBackgroundImageProperty1.fileType)}}" stepKey="seeSlide1BackgroundAdmin"/>
178177
<click selector="{{SliderInAdmin.nextSlide}}" stepKey="clickNextSlideOnSliderAdmin"/>
179178
<waitForElementVisible time="2" selector="{{SlideOnBackend.slide('1')}}" stepKey="waitForSlide2Admin" />
@@ -183,7 +182,6 @@
183182
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('1')}}" stepKey="seeSlide2ContentDisplayedAdmin"/>
184183
<see userInput="{{PageBuilderSlideItemButtonText2.value}}" selector="{{SlideOnBackend.slideButtonText('1')}}" stepKey="seeSlide2LinkTextDisplayedAdmin"/>
185184
<seeElement selector="{{SlideOnBackend.slideAppearancePoster('1')}}" stepKey="verifySlide2HasPosterAppearance"/>
186-
<seeElement selector="{{SlideOnBackend.slideLinkURL2(PageBuilderSlideItemLinkURL2.value)}}" stepKey="seeSlide2LinkURLAdmin"/>
187185
<seeElement selector="{{SlideOnBackend.slideBackgroundImage('1',PageBuilderSlideBackgroundImageProperty2.path, PageBuilderSlideBackgroundImageProperty2.fileType)}}" stepKey="seeSlide2BackgroundAdmin"/>
188186
<actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
189187
<argument name="contentType" value="PageBuilderSliderContentType"/>
@@ -197,7 +195,7 @@
197195
<seeElement selector="{{SliderOnFrontend.IsInfinite(PageBuilderSliderIsInfiniteProperty.value)}}" stepKey="seeSliderIsInfiniteSetting"/>
198196
<seeElement selector="{{SliderOnFrontend.ShowArrows(PageBuilderSliderShowArrowsYesProperty.value)}}" stepKey="seeSliderShowArrowsSetting"/>
199197
<seeElement selector="{{SliderOnFrontend.ShowDots(PageBuilderSliderShowDotsNoProperty.value)}}" stepKey="seeSliderShowDotsOffOnFrontendSetting"/>
200-
<seeElement selector="{{SliderOnFrontend.sliderBorderColor}}" stepKey="seeSliderShowGreenColor"/>
198+
<seeElement selector="{{SliderOnFrontend.sliderBorder(PageBuilderAdvancedBorderWidthProperty10.value, PageBuilderAdvancedBorderPropertyDotted.value, PageBuilderAdvancedBorderColorProperty_green.rbg)}}" stepKey="verifyBorderStyleOnStorefront"/>
201199
<seeElement selector="{{SliderOnFrontend.sliderMinHeight(PageBuilderSliderMinHeight500Property.value)}}" stepKey="verifyMinHeightOnFrontEnd"/>
202200
<seeElement selector="{{SliderOnFrontend.sliderMarginPaddings(PageBuilderAdvancedMarginsAndPaddingProperty.marginTop, PageBuilderAdvancedMarginsAndPaddingProperty.paddingTop)}}" stepKey="verifySliderMarginPaddingOnFrontEnd"/>
203201
<comment userInput="Validate Slide 1 on Storefront" stepKey="commentValidateSlide1Storefront"/>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_column_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<field name="background_repeat" sortOrder="50" formElement="checkbox">
208208
<argument name="data" xsi:type="array">
209209
<item name="config" xsi:type="array">
210-
<item name="default" xsi:type="string">0</item>
210+
<item name="default" xsi:type="string">no-repeat</item>
211211
</item>
212212
</argument>
213213
<settings>

‎app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_slide_form.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
<field name="background_repeat" sortOrder="60" formElement="checkbox">
226226
<argument name="data" xsi:type="array">
227227
<item name="config" xsi:type="array">
228-
<item name="default" xsi:type="string">0</item>
228+
<item name="default" xsi:type="string">no-repeat</item>
229229
</item>
230230
</argument>
231231
<settings>
@@ -237,8 +237,8 @@
237237
<checkbox>
238238
<settings>
239239
<valueMap>
240-
<map name="false" xsi:type="number">0</map>
241-
<map name="true" xsi:type="number">1</map>
240+
<map name="false" xsi:type="string">no-repeat</map>
241+
<map name="true" xsi:type="string">repeat</map>
242242
</valueMap>
243243
<prefer>toggle</prefer>
244244
</settings>

‎app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/preview.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)