Skip to content

Commit c70acb8

Browse files
MC-3735: Allow inline WYSIWYG editing of slides
- Fix tests
1 parent a0f1b11 commit c70acb8

File tree

2 files changed

+23
-18
lines changed

2 files changed

+23
-18
lines changed

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</actionGroup>
2626
<actionGroup name="addSlide">
2727
<waitForElementVisible time="10" selector="{{SliderInAdmin.sliderContainer}}" stepKey="waitForContentTypeInStageVisible" />
28-
<click stepKey="focusOnSlider" selector="{{SliderInAdmin.sliderContainer}}"/>
28+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickOutsideLiveEdit"/>
2929
<scrollTo selector="div.pagebuilder-header" x="0" y="-100" stepKey="scrollToTop"/>
3030
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage"/>
3131
<waitForPageLoad stepKey="waitForPageLoad1"/>

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

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@
486486
<!-- Validate Slider Edit Panel Defaults -->
487487
<comment userInput="Validate Slider Edit Panel Defaults" stepKey="commentSliderEditPanel"/>
488488
<scrollTo selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="scrollToTop"/>
489-
<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage"/>
489+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlider"/>
490490
<actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditMenu">
491491
<argument name="contentType" value="PageBuilderSliderContentType"/>
492492
</actionGroup>
@@ -632,7 +632,8 @@
632632
<scrollTo selector="{{CmsNewPagePageActionsSection.content}}" stepKey="scrollToContent"/>
633633
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage"/>
634634
<wait time="0.5" stepKey="waitForMouseOverAnimation" />
635-
<click stepKey="focusOnSlider" selector="{{SliderInAdmin.sliderContainer}}"/>
635+
<click stepKey="focusOut" selector="{{PageBuilderPanel.searchPanel}}"/>
636+
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage1"/>
636637

637638
<waitForElementVisible time="5" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderSliderContentType.role)}}" stepKey="seeContentTypeOptionsMenu"/>
638639
<moveMouseOver selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenu(PageBuilderSliderContentType.role)}}" stepKey="onMouseOverOptionsMenu"/>
@@ -673,7 +674,7 @@
673674
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel2Settings"/>
674675

675676
<comment userInput="User hovers each slide dot, user sees tooltip displayed with Slide name" stepKey="AC15"/>
676-
<click stepKey="unfocusNavigation" selector="{{SliderInAdmin.sliderContainer}}"/>
677+
<click stepKey="unfocusNavigation" selector="{{PageBuilderPanel.searchPanel}}"/>
677678
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2"/>
678679
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltip"/>
679680
<moveMouseOver selector="{{SliderInAdmin.slideNavigationDot('1')}}" stepKey="moveMouseOverFirstSlideNavigationDot"/>
@@ -720,7 +721,7 @@
720721
<argument name="section" value="SlideOnConfigurationPanel"/>
721722
</actionGroup>
722723
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
723-
<click stepKey="unfocusNavigation" selector="{{SliderInAdmin.sliderContainer}}"/>
724+
<click stepKey="unfocusNavigation" selector="{{PageBuilderPanel.searchPanel}}"/>
724725
<waitForPageLoad stepKey="waitForOptionsHide"/>
725726
<actionGroup ref="hideContentType" stepKey="hideContentType">
726727
<argument name="section" value="SliderInAdmin"/>
@@ -791,7 +792,7 @@
791792
<argument name="contentType" value="PageBuilderSliderContentType"/>
792793
</actionGroup>
793794
<actionGroup ref="closeEditPanelSettings" stepKey="closeSlideEditPanel"/>
794-
<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage"/>
795+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlide"/>
795796
<actionGroup ref="removeContentTypeFromStage" stepKey="removeEmptyContentTypeFromStage">
796797
<argument name="contentType" value="PageBuilderSliderContentType"/>
797798
</actionGroup>
@@ -895,7 +896,7 @@
895896
<argument name="contentType" value="PageBuilderSliderContentType"/>
896897
</actionGroup>
897898
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
898-
<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage"/>
899+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlider"/>
899900
<actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
900901
<argument name="contentType" value="PageBuilderSliderContentType"/>
901902
</actionGroup>
@@ -1604,7 +1605,7 @@
16041605
</actionGroup>
16051606
<actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
16061607
<!--Verify there are 2 buttons when hovering-->
1607-
<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage1"/>
1608+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickSearchPanel"/>
16081609
<comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons" />
16091610
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons" >
16101611
<argument name="contentType" value="PageBuilderSliderContentType"/>
@@ -1617,7 +1618,8 @@
16171618
<waitForElementVisible selector="{{ImageOnConfigurationPanel.imageSource(PageBuilderImageProperty_JPG.fileName)}}" stepKey="waitForMainImageSource1"/>
16181619
<!--Upload image from Media Gallery Storage -->
16191620
<comment userInput="Upload image from Media Gallery Storage" stepKey="commentUploadImageFromStorage"/>
1620-
<click selector="{{SliderInAdmin.slideWrapper}}" stepKey="clickSliderInStage"/>
1621+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickSearchPanel1"/>
1622+
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage"/>
16211623
<waitForElementVisible selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="seeSelectFromGalleryBtn2" />
16221624
<click selector="{{ImageOnStage.selectFromGalleryImageBtn}}" stepKey="clickSelectFromGallery" />
16231625
<waitForPageLoad stepKey="waitForPageLoad2" />
@@ -1681,7 +1683,8 @@
16811683
<argument name="property" value="PageBuilderSlideCollageLeftProperty"/>
16821684
</actionGroup>
16831685
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
1684-
<click selector="{{SlideOnBackend.collageOverlayGeneral}}" stepKey="clickSliderInStage1"/>
1686+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickSearchPanel"/>
1687+
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage"/>
16851688
<comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons1" />
16861689
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons1" >
16871690
<argument name="contentType" value="PageBuilderSliderContentType"/>
@@ -1695,7 +1698,8 @@
16951698
<argument name="property" value="PageBuilderSlideCollageCenteredProperty"/>
16961699
</actionGroup>
16971700
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
1698-
<click selector="{{SlideOnBackend.collageOverlayGeneral}}" stepKey="clickSliderInStage2"/>
1701+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickSearchPanel1"/>
1702+
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage1"/>
16991703
<comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons2" />
17001704
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons2" >
17011705
<argument name="contentType" value="PageBuilderSliderContentType"/>
@@ -1710,7 +1714,8 @@
17101714
</actionGroup>
17111715
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
17121716
<!--Verify there are 2 buttons when hovering-->
1713-
<click selector="{{SlideOnBackend.collageOverlayGeneral}}" stepKey="clickSliderInStage3"/>
1717+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="clickSearchPanel2"/>
1718+
<moveMouseOver selector="{{SliderInAdmin.sliderContainer}}" x="10" y="10" stepKey="onMouseOverContentTypeStage2"/>
17141719
<comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons3" />
17151720
<actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons3" >
17161721
<argument name="contentType" value="PageBuilderSliderContentType"/>
@@ -2028,7 +2033,7 @@
20282033
<argument name="section" value="SlideOnConfigurationPanel"/>
20292034
</actionGroup>
20302035
<actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
2031-
<click stepKey="unfocusNavigation" selector="{{SliderInAdmin.sliderContainer}}"/>
2036+
<click stepKey="unfocusNavigation" selector="{{PageBuilderPanel.searchPanel}}"/>
20322037
<waitForPageLoad stepKey="waitForOptionsHide"/>
20332038
<actionGroup ref="hideContentType" stepKey="hideContentType">
20342039
<argument name="section" value="SliderInAdmin"/>
@@ -2591,7 +2596,7 @@
25912596

25922597
<!-- Validate first slide -->
25932598
<comment userInput="User sees Slide on stage with updated title and content." stepKey="checkFilledData"/>
2594-
<click stepKey="unfocusNavigation" selector="{{SliderInAdmin.sliderContainer}}"/>
2599+
<click stepKey="unfocusNavigation" selector="{{PageBuilderPanel.searchPanel}}"/>
25952600
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide"/>
25962601
<see userInput="{{PageBuilderSlideItemName1.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideNameInTooltip"/>
25972602
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlide1ContentDisplayedAdmin"/>
@@ -2613,7 +2618,7 @@
26132618

26142619
<!-- Validate second slide data -->
26152620
<comment userInput="User sees Second Slide on stage with updated title and content." stepKey="checkFilledData2"/>
2616-
<click stepKey="unfocusNavigation2" selector="{{SliderInAdmin.sliderContainer}}"/>
2621+
<click stepKey="unfocusNavigation2" selector="{{PageBuilderPanel.searchPanel}}"/>
26172622
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2"/>
26182623
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltip"/>
26192624
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('1')}}" stepKey="seeSlide2ContentDisplayedAdmin"/>
@@ -2627,7 +2632,7 @@
26272632
<comment userInput="Validate saved data" stepKey="validateSavedData"/>
26282633
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
26292634
<see userInput="{{PageBuilderSlideItemContent1.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlideContentAfterSave"/>
2630-
<click selector="{{SliderInAdmin.sliderContainer}}" stepKey="unfocusNavigationAfterSave"/>
2635+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusNavigationAfterSave"/>
26312636
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide1AfterSave"/>
26322637
<see userInput="{{PageBuilderSlideItemName1.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName1InTooltipAfterSave"/>
26332638
<moveMouseOver selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave"/>
@@ -2650,7 +2655,7 @@
26502655

26512656
<!-- Validate Side names after sorting -->
26522657
<comment userInput="User hovers each slide dot, user sees tooltip displayed with Slide name after sorting" stepKey="checkAfterSort"/>
2653-
<click selector="{{SliderInAdmin.sliderContainer}}" stepKey="unfocusNavigationAfterSort"/>
2658+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusNavigationAfterSort"/>
26542659
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSort"/>
26552660
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltipAfterSort"/>
26562661
<moveMouseOver selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="moveMouseOverSecondSlideNavigationDot"/>
@@ -2665,7 +2670,7 @@
26652670
<comment userInput="Validate saved data" stepKey="validateSavedData2"/>
26662671
<actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
26672672
<see userInput="{{PageBuilderSlideItemContent2.value}}" selector="{{SlideOnBackend.slideContent('0')}}" stepKey="seeSlide2ContentAfterSave"/>
2668-
<click selector="{{SliderInAdmin.sliderContainer}}" stepKey="unfocusNavigationAfterSave2"/>
2673+
<click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusNavigationAfterSave2"/>
26692674
<moveMouseOver selector="{{SliderInAdmin.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide2AfterSave"/>
26702675
<see userInput="{{PageBuilderSlideItemName2.value}}" selector="{{SliderInAdmin.slideNavigationDotNameTooltip}}" stepKey="seeSlideName2InTooltipAfterSave2"/>
26712676
<moveMouseOver selector="{{SliderInAdmin.slideNavigationDot('2')}}" stepKey="moveMouseOverSecondSlideNavigationDotAfterSave2"/>

0 commit comments

Comments
 (0)