Skip to content

Commit 9d6f6ea

Browse files
dhaeckerdhaecker
committed
MC-2413: Fix Slider Issues
- Adding edit form default test steps for slider - Fixing AddSliderContentTypeToCMSPage test to conditional click toggles - Fixing slider data names & updating affected tests
1 parent be996e2 commit 9d6f6ea

File tree

3 files changed

+123
-37
lines changed

3 files changed

+123
-37
lines changed

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

Lines changed: 38 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,74 +8,99 @@
88

99
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
11-
<!-- Autoplay -->
12-
<entity name="PageBuilderSliderAutoplayOffProperty" type="pagebuilder_slider_property">
11+
<!-- AutoPlay -->
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="PageBuilderSliderAutoplayOnProperty" type="pagebuilder_slider_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>
24-
<!-- Autoplay Speed -->
25-
<entity name="PageBuilderSliderAutoplaySpeed5000Property" type="pagebuilder_slider_property">
24+
<!-- AutoPlay Speed -->
25+
<entity name="PageBuilderSliderAutoplaySpeed_Default" type="pagebuilder_slider_autoplay_speed_property">
26+
<data key="name">Autoplay Speed</data>
27+
<data key="section">settings</data>
28+
<data key="fieldName">autoplay_speed</data>
29+
<data key="value">4000</data>
30+
</entity>
31+
<entity name="PageBuilderSliderAutoplaySpeed_5000" type="pagebuilder_slider_autoplay_speed_property">
2632
<data key="name">Autoplay Speed</data>
2733
<data key="section">settings</data>
2834
<data key="fieldName">autoplay_speed</data>
2935
<data key="value">5000</data>
3036
</entity>
3137
<!-- Fade -->
32-
<entity name="PageBuilderSliderFadeYesProperty" type="pagebuilder_slider_property">
38+
<entity name="PageBuilderSliderFade_Enabled" type="pagebuilder_slider_fade_property">
3339
<data key="name">Fade</data>
3440
<data key="section">settings</data>
3541
<data key="fieldName">fade</data>
3642
<data key="value">true</data>
3743
</entity>
44+
<entity name="PageBuilderSliderFade_Disabled" type="pagebuilder_slider_fade_property">
45+
<data key="name">Fade</data>
46+
<data key="section">settings</data>
47+
<data key="fieldName">fade</data>
48+
<data key="value">false</data>
49+
</entity>
3850
<!-- Infinite Loop -->
39-
<entity name="PageBuilderSliderIsInfiniteProperty" type="pagebuilder_slider_property">
51+
<entity name="PageBuilderSliderInfinite_Enabled" type="pagebuilder_slider_infinite_loop_property">
4052
<data key="name">Is Infinite</data>
4153
<data key="section">settings</data>
4254
<data key="fieldName">is_infinite</data>
4355
<data key="value">true</data>
4456
</entity>
57+
<entity name="PageBuilderSliderInfiniteLoop_Disabled" type="pagebuilder_slider_infinite_loop_property">
58+
<data key="name">Is Infinite</data>
59+
<data key="section">settings</data>
60+
<data key="fieldName">is_infinite</data>
61+
<data key="value">false</data>
62+
</entity>
4563
<!-- Show Arrows -->
46-
<entity name="PageBuilderSliderShowArrowsYesProperty" type="pagebuilder_slider_property">
64+
<entity name="PageBuilderSliderShowArrows_Enabled" type="pagebuilder_slider_show_arrows_property">
4765
<data key="name">Show Arrows</data>
4866
<data key="section">settings</data>
4967
<data key="fieldName">show_arrows</data>
5068
<data key="value">true</data>
5169
</entity>
70+
<entity name="PageBuilderSliderShowArrows_Disabled" type="pagebuilder_slider_show_arrows_property">
71+
<data key="name">Show Arrows</data>
72+
<data key="section">settings</data>
73+
<data key="fieldName">show_arrows</data>
74+
<data key="value">false</data>
75+
</entity>
5276
<!-- Show Dots -->
53-
<entity name="PageBuilderSliderShowDotsNoProperty" type="pagebuilder_slider_property">
77+
<entity name="PageBuilderSliderShowDots_Disabled" type="pagebuilder_slider_show_dots_property">
5478
<data key="name">Show dots</data>
5579
<data key="section">settings</data>
5680
<data key="fieldName">show_dots</data>
5781
<data key="value">false</data>
5882
</entity>
59-
<entity name="PageBuilderSliderShowDotsYesProperty" type="pagebuilder_slider_property">
83+
<entity name="PageBuilderSliderShowDots_Enabled" type="pagebuilder_slider_show_dots_property">
6084
<data key="name">Show dots</data>
6185
<data key="section">settings</data>
6286
<data key="fieldName">show_dots</data>
6387
<data key="value">true</data>
6488
</entity>
6589
<!-- Minimum Height -->
66-
<entity name="PageBuilderSliderMinHeightDefault300Property" type="pagebuilder_slider_property">
90+
<entity name="PageBuilderSliderMinHeight_Default" type="pagebuilder_slider_min_height_property">
6791
<data key="name">Minimum Height</data>
6892
<data key="section">settings</data>
6993
<data key="fieldName">min_height</data>
7094
<data key="value">300</data>
7195
</entity>
72-
<entity name="PageBuilderSliderMinHeight500Property" type="pagebuilder_slider_property">
96+
<entity name="PageBuilderSliderMinHeight_500" type="pagebuilder_slider_min_height_property">
7397
<data key="name">Minimum Height</data>
7498
<data key="section">settings</data>
7599
<data key="fieldName">min_height</data>
76100
<data key="value">500</data>
77101
</entity>
78-
<entity name="PageBuilderEmptySliderContainerHeightProperty" type="pagebuilder_slider_property">
102+
<!-- Container Height -->
103+
<entity name="PageBuilderEmptySliderContainerHeight" type="pagebuilder_slider_height_property">
79104
<data key="value">368</data>
80105
</entity>
81106
</entities>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
<actionGroup ref="validateContentTypeHeightOnStage" stepKey="assertInitialSliderHeightMatchesExpected">
330330
<argument name="contentType" value="PageBuilderSliderContentType"/>
331331
<argument name="index" value="1"/>
332-
<argument name="containerDefaultHeight" value="PageBuilderEmptySliderContainerHeightProperty"/>
332+
<argument name="containerDefaultHeight" value="PageBuilderEmptySliderContainerHeight"/>
333333
<argument name="expectedPaddingTop" value="PageBuilderAdvancedMarginsAndPaddingPropertyDefault"/>
334334
<argument name="expectedPaddingBottom" value="PageBuilderAdvancedMarginsAndPaddingPropertyDefault"/>
335335
</actionGroup>

0 commit comments

Comments
 (0)