Skip to content

Commit 1760bd0

Browse files
author
Hwashiang Yu
committed
MC-4156: Slider with autoplay cannot be inline edited
- Updated sliderfadecanbeinlineedited test annotations - Updated test selectors to be more specific - Updaged test to also do post save validation - Removed extra jQuery wrapping in component-initializer.ts
1 parent 95d1eab commit 1760bd0

File tree

3 files changed

+32
-18
lines changed

3 files changed

+32
-18
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests.xml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,10 +1558,10 @@
15581558
<annotations>
15591559
<features value="PageBuilder"/>
15601560
<stories value="Slider"/>
1561-
<title value="Slider - Fade can be inline edited"/>
1562-
<description value="A user should be able to inline edit a fade slide"/>
1563-
<severity value="CRITICAL"/>
1564-
<useCaseId value="MC0-4156"/>
1561+
<title value="Slider - Slide Items Can Be Inline Edited When Slider Has Fade Enabled"/>
1562+
<description value="A user should be able to inline edit a slide when the slider has fade enabled"/>
1563+
<severity value="MAJOR"/>
1564+
<useCaseId value="MC-4156"/>
15651565
<testCaseId value="MC-5058"/>
15661566
<group value="pagebuilder"/>
15671567
<group value="pagebuilder-slide"/>
@@ -1611,8 +1611,8 @@
16111611
<waitForPageLoad stepKey="waitForWysiwyg"/>
16121612
<executeJS function="return document.querySelectorAll('[data-role=slide]')[1].getBoundingClientRect().left" stepKey="slideLeftPosition"/>
16131613
<executeJS function="return document.querySelectorAll('[data-role=slide]')[1].getBoundingClientRect().right" stepKey="slideRightPosition"/>
1614-
<executeJS function="return document.querySelectorAll('.slider-container')[1].getBoundingClientRect().left" stepKey="sliderLeftPosition"/>
1615-
<executeJS function="return document.querySelectorAll('.slider-container')[1].getBoundingClientRect().right" stepKey="sliderRightPosition"/>
1614+
<executeJS function="return document.querySelectorAll('.slider-container.content-type-container')[0].getBoundingClientRect().left" stepKey="sliderLeftPosition"/>
1615+
<executeJS function="return document.querySelectorAll('.slider-container.content-type-container')[0].getBoundingClientRect().right" stepKey="sliderRightPosition"/>
16161616
<assertLessThan stepKey="assertSlideRightSideIsLessThanSliderRightSide">
16171617
<expectedResult type="variable">slideRightPosition</expectedResult>
16181618
<actualResult type="variable">sliderRightPosition</actualResult>
@@ -1621,5 +1621,19 @@
16211621
<expectedResult type="variable">sliderLeftPosition</expectedResult>
16221622
<actualResult type="variable">slideLeftPosition</actualResult>
16231623
</assertGreaterThan>
1624+
<!-- Add Content To Slide 2 -->
1625+
<comment userInput="Add Content To Slide 2" stepKey="commentAddContentToSlide2"/>
1626+
<actionGroup ref="inlineEditWYSIWYGFromStage" stepKey="inlineEdit">
1627+
<argument name="contentType" value="PageBuilderSlideContentType"/>
1628+
<argument name="content" value="{{PageBuilderSlideItemContent_Slide1.value}}"/>
1629+
<argument name="index" value="2"/>
1630+
</actionGroup>
1631+
<actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
1632+
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
1633+
<!-- Validate Stage After Save -->
1634+
<comment userInput="Validate Stage After Save" stepKey="commentValidateStage"/>
1635+
<click selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="clickSlide2StageAfterSave"/>
1636+
<waitForPageLoad stepKey="waitForSlideFadeAnimationAfterSave"/>
1637+
<seeElement selector="{{SlideOnBackend.messageContent('2', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeMessageContentStage"/>
16241638
</test>
16251639
</tests>

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/wysiwyg/tinymce4/component-initializer.js

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

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce4/component-initializer.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ export default class ComponentInitializer implements WysiwygComponentInitializer
8484
});
8585

8686
// Disable slider keyboard events and fix problem with overflow hidden issue
87-
$($slider.parent()).slick("slickSetOption", "accessibility", false);
88-
this.autoplay = $($slider.parent()).slick("slickGetOption", "autoplay") as boolean;
89-
this.fade = $($slider.parent()).slick("slickGetOption", "fade") as boolean;
87+
$slider.parent().slick("slickSetOption", "accessibility", false);
88+
this.autoplay = $slider.parent().slick("slickGetOption", "autoplay") as boolean;
89+
this.fade = $slider.parent().slick("slickGetOption", "fade") as boolean;
9090
if (this.autoplay) {
91-
$($slider.parent()).slick("slickPause");
91+
$slider.parent().slick("slickPause");
9292
}
9393
if (!this.fade) {
9494
$notActiveSlides.css("display", "none");
@@ -116,9 +116,9 @@ export default class ComponentInitializer implements WysiwygComponentInitializer
116116
$slider.css("overflow", "hidden");
117117
sliderContent.style.transform = this.sliderTransform;
118118
$notActiveSlides.css("display", "block");
119-
$($slider.parent()).slick("slickSetOption", "accessibility", true);
119+
$slider.parent().slick("slickSetOption", "accessibility", true);
120120
if (this.autoplay) {
121-
$($slider.parent()).slick("slickPlay");
121+
$slider.parent().slick("slickPlay");
122122
}
123123
}
124124
}

0 commit comments

Comments
 (0)