Merge branch 'MAGETWO-75104-Slide-and-Banner-Image-from-Stage' of github.com:magento-trigger/magento2-page-builder into MAGETWO-75104-Slide-and-Banner-Image-from-Stage

Author: nathanjosiah

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

@@ -131,7 +131,7 @@
     </section>
     <section name="SlideOnBackend">
         <element name="optionTitle" type="button" selector=".pagebuilder-slider .navigation-dot.active .option-title"/>
-        <element name="collageOverlay" type="button" selector=".pagebuilder-collage-overlay"/>
+        <element name="collageOverlayGeneral" type="button" selector=".pagebuilder-collage-overlay"/>
         <element name="slideAppearancePoster" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-poster-content" parameterized="true"/>
         <element name="slideAppearanceCollageLeft" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide [style*='40px calc(50% + 40px) 40px 40px']" parameterized="true"/>
         <element name="slideAppearanceCollageCenter" type="button" selector="[data-slick-index='{{arg1}}'] .pagebuilder-slide [style*='40px calc(25% + 40px)']" parameterized="true"/>
@@ -186,7 +186,6 @@
         <element name="slideBorderRadiusStyle" type="button" selector="div[style*='border-radius: {{arg1}}']" parameterized="true"/>
         <element name="editFormBackgroundImagePreview" type="button" selector="//input[@name='background_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
         <element name="editFormBackgroundMobileImagePreview" type="button" selector="//input[@name='mobile_image']/ancestor::div[@class='admin__field-control']/descendant::img"/>
-        <element name="collageOverlay" type="button" selector=".pagebuilder-collage-overlay"/>
     </section>
     <section name="SlideOnConfigurationPanel">
         <element name="tinyMCEIFrame" type="text" selector="pagebuilder_slide_form_content_ifr"/>

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

@@ -1073,7 +1073,8 @@
             <title value="Add image into Banner from the Stage"/>
             <description value="A user should be able to add image to Banner stage."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-75104"/>
+            <testCaseId value="MAGETWO-92118"/>
+            <useCaseId value="MAGETWO-75104"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
@@ -1143,7 +1144,8 @@
             <title value="Add image into Banner from the Stage"/>
             <description value="A user should be able to add image to Banner stage when switching between appearance type"/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-75104"/>
+            <useCaseId value="MAGETWO-75104"/>
+            <testCaseId value="MAGETWO-92118"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>

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

@@ -1048,7 +1048,8 @@
             <title value="Add image into Slider from the Stage"/>
             <description value="A user should be able to add image to Slider stage."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-75104"/>
+            <useCaseId value="MAGETWO-75104"/>
+            <testCaseId value="MAGETWO-92116"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCommon"/>
@@ -1120,7 +1121,8 @@
             <title value="Add image into Slider from the Stage"/>
             <description value="A user should be able to add image to Slider stage when switching between appearance type."/>
             <severity value="CRITICAL"/>
-            <testCaseId value="MAGETWO-75104"/>
+            <useCaseId value="MAGETWO-75104"/>
+            <testCaseId value="MAGETWO-92116"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCommon"/>
@@ -1147,7 +1149,7 @@
             <argument name="property" value="PageBuilderSlideCollageLeftProperty"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
-        <click selector="{{SlideOnBackend.collageOverlay}}" stepKey="clickSliderInStage1"/>
+        <click selector="{{SlideOnBackend.collageOverlayGeneral}}" stepKey="clickSliderInStage1"/>
         <comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons1" />
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons1" >
             <argument name="contentBlockType" value="PageBuilderSliderContentBlock"/>
@@ -1161,7 +1163,7 @@
             <argument name="property" value="PageBuilderSlideCollageCenteredProperty"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings2"/>
-        <click selector="{{SlideOnBackend.collageOverlay}}" stepKey="clickSliderInStage2"/>
+        <click selector="{{SlideOnBackend.collageOverlayGeneral}}" stepKey="clickSliderInStage2"/>
         <comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons2" />
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons2" >
             <argument name="contentBlockType" value="PageBuilderSliderContentBlock"/>
@@ -1176,7 +1178,7 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings3"/>
         <!--Verify there are 2 buttons when hovering-->
-        <click selector="{{SlideOnBackend.collageOverlay}}" stepKey="clickSliderInStage3"/>
+        <click selector="{{SlideOnBackend.collageOverlayGeneral}}" stepKey="clickSliderInStage3"/>
         <comment userInput="Verify there are 2 buttons when hovering" stepKey="commentVerifyButtons3" />
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons3" >
             <argument name="contentBlockType" value="PageBuilderSliderContentBlock"/>