Merge remote-tracking branch 'mainline/develop' into develop-s3

Author: duhon

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

@@ -18,6 +18,7 @@
         <element name="previousSlideArrow" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]//button[contains(@class,'slick-arrow') and contains(@class,'slick-prev')]" parameterized="true"/>
         <element name="nextSlideArrow" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]//button[contains(@class,'slick-arrow') and contains(@class,'slick-next')]" parameterized="true"/>
         <element name="activeSlideNavigationDot" type="button" selector="div.navigation-dot.active"/>
+        <element name="activeSlideNavigationDotWithParams" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]//div[contains(@class,'navigation-dot') and contains(@class, 'active')][{{navigationDotIndex}}]" parameterized="true"/>
         <element name="slideNavigationDotNameTooltip" type="button" selector="(//div[@data-content-type='slider'])[{{sliderIndex}}]//span[@role='tooltip']" parameterized="true"/>
         <element name="slideNavigationDragHandle" type="button" selector="a.navigation-dot-anchor"/>
         <element name="slideNavigationDragHandleByIndex" type="button" selector="((//div[@data-content-type='slider'])[{{sliderIndex}}]//a[contains(@class,'navigation-dot-anchor')])[{{navigationDotIndex}}]" parameterized="true"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemMoveSlideItemsToRearrangeTest.xml

@@ -91,8 +91,10 @@
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
         <!-- Validate Stage -->
         <comment userInput="Validate Stage" stepKey="commentValidateStage"/>
+        <waitForElementVisible selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="waitForSlideContentLoad"/>
         <seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemContent_Slide1.value)}}" stepKey="seeSlideContentAfterSave"/>
-        <waitForElementNotVisible selector="{{SlideOnBackend.base('2')}}" stepKey="dontSeeNextSlideAfterSave"/>
+        <dontSeeElement selector="{{SliderOnStage.activeSlideNavigationDotWithParams('1', '2')}}" stepKey="dontSeeSecondSlideActiveDot"/>
+        <dontSeeElement selector="{{SlideOnBackend.base('2')}}" stepKey="dontSeeSecondSlideAfterSave"/>
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusNavigationAfterSave"/>
         <moveMouseOver selector="{{SliderOnStage.activeSlideNavigationDot}}" stepKey="mouseOverActiveSlide1AfterSave"/>
         <see userInput="{{PageBuilderSlideItemSlideName_Slide1.value}}" selector="{{SliderOnStage.slideNavigationDotNameTooltip('1')}}" stepKey="seeSlideName1InTooltipAfterSave"/>