MC-4129: Edit Panel Opens After Dragging & Dropping Content Types

- Resolve remaining test failures

Author: davemacaulay

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

@@ -28,17 +28,6 @@
         <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeNumber)}}" stepKey="waitForContentTypeInStage" />
         <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
     </actionGroup>
-    <actionGroup name="dragContentTypeToStageAndExpectEditPanel">
-        <arguments>
-            <argument name="contentType"/>
-        </arguments>
-        <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.dropAreaInStage}}" stepKey="dropContentTypeIntoStage"/>
-        <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
-        <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStage(contentType.role)}}" stepKey="waitForContentTypeInStage" />
-        <waitForElementVisible time="10" selector="{{EditPanelForm.editFormTitle}}" stepKey="waitForContentTypeNameInEditFormTitle" />
-        <see userInput="Edit {{contentType.editPanelName}}" selector="{{EditPanelForm.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
-        <waitForPageLoad stepKey="waitForEditFormLoad" time="30"/>
-    </actionGroup>
     <actionGroup name="dragContentTypeToContainer">
         <arguments>
             <argument name="contentType"/>
@@ -71,20 +60,6 @@
         <waitForElementNotVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeNotOnStage" />
         <dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="dontSeeElementInContainer" />
     </actionGroup>
-    <actionGroup name="dragContentTypeToContainerAndExpectEditPanel">
-        <arguments>
-            <argument name="contentType"/>
-            <argument name="contentTypeIndex" defaultValue="1" type="string"/>
-            <argument name="containerTargetType"/>
-            <argument name="containerTargetIndex" defaultValue="1" type="string"/>
-        </arguments>
-        <scrollTo selector="{{CmsNewPagePageActionsSection.contentSectionName}}" stepKey="scrollToTopOfStage"/>
-        <dragAndDrop selector1="{{PageBuilderPanel.draggableContentTypeInPanel(contentType.name)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}" stepKey="dropContentTypeIntoStage"/>
-        <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
-        <waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInContainer"/>
-        <waitForElementVisible time="30" selector="{{EditPanelForm.editFormTitle}}" stepKey="waitForContentTypeNameInEditFormTitle"/>
-        <see userInput="Edit {{contentType.editPanelName}}" selector="{{EditPanelForm.editFormTitle}}" stepKey="seeContentTypeNameInEditFormTitle"/>
-    </actionGroup>
     <!-- Test to ensure a content block doesn't receive drop events -->
     <actionGroup name="dragContentTypeToContentType">
         <arguments>

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

@@ -82,10 +82,9 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroupAddContent">
             <argument name="group" value="PageBuilderBlockContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragBlockIntoStage">
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragBlockIntoStage">
             <argument name="contentType" value="PageBuilderBlockContentType"/>
         </actionGroup>
-        <actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
         <actionGroup ref="dragContentTypeToStage" stepKey="dragProductIntoStage">
             <argument name="contentType" value="PageBuilderProductsContentType"/>
         </actionGroup>

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

@@ -1764,7 +1764,7 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
             <argument name="group" value="PageBuilderMapContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToContainer" stepKey="dragMapOntoColumnAndExpectEditPanel">
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragMapOntoColumn">
             <argument name="contentType" value="PageBuilderMapContentType"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="2" />
@@ -1869,7 +1869,7 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupMedia">
             <argument name="group" value="PageBuilderMapContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToContainerAndExpectEditPanel" stepKey="dragMapToColumn">
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragMapToColumn">
             <argument name="contentType" value="PageBuilderMapContentType"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="2" />

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

@@ -39,12 +39,13 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
             <argument name="group" value="PageBuilderSliderContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStage">
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStageNoEditPanel">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
-        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanel">
+        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="dragSliderIntoStage">
             <argument name="section" value="SlideOnBackend"/>
         </actionGroup>
+        <!-- Extended tests modify configuration of slider here -->
         <actionGroup ref="closeEditPanelSettings" stepKey="closeEditPanelSettings"/>
         <!-- Inline Edit Slide Content -->
         <comment userInput="Inline Edit Slide Content" stepKey="commentInlineEdit"/>

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

@@ -595,6 +595,10 @@
         <!-- Add Slide 2 -->
         <comment userInput="Add Slide 2" stepKey="commentAddSlide"/>
         <actionGroup ref="addSlide" stepKey="addSlide2"/>
+        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelAfterAdd">
+            <argument name="section" value="SlideOnBackend"/>
+            <argument name="targetIndex" value="2"/>
+        </actionGroup>
         <!-- Edit Slide 2 -->
         <comment userInput="Edit Slide 2" stepKey="commentEditSlide2"/>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterSlideNameText2">
@@ -728,7 +732,6 @@
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
         <actionGroup ref="addSlide" stepKey="addSlide"/>
-        <actionGroup ref="closeEditPanelSettings" stepKey="closeSlideEditPanel2"/>
         <seeNumberOfElements selector="{{SlideOnBackend.all}}" userInput="2" stepKey="seeSlidesStage1"/>
         <!-- Remove Slide Before Page Save (No Confirmation Modal) -->
         <comment userInput="Remove Slide Before Page Save" stepKey="commentRemoveSlide1"/>
@@ -740,7 +743,6 @@
         <!-- Add Slide Again -->
         <comment userInput="Add Slide Again" stepKey="commentAddSlideAgain"/>
         <actionGroup ref="addSlide" stepKey="addSlide2"/>
-        <actionGroup ref="closeEditPanelSettings" stepKey="closeSlideEditPanel3"/>
         <seeNumberOfElements selector="{{SlideOnBackend.all}}" userInput="2" stepKey="seeSlidesStage3"/>
         <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -1383,9 +1385,12 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandPageBuilderPanelGroup">
             <argument name="group" value="PageBuilderSliderContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToStageAndExpectEditPanel" stepKey="dragSliderIntoStage">
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStage">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelAfterAdd">
+            <argument name="section" value="SlideOnBackend"/>
+        </actionGroup>
         <!--Upload image from local machine using image placeholder button-->
         <comment userInput="Upload image from local machine using image placeholder button on slide out" stepKey="commentUploadImage"/>
         <actionGroup ref="attachFileSlideOutProperty" stepKey="attachSlideImageFile1">
@@ -1703,6 +1708,10 @@
         <!-- Test removing added slide -->
         <comment userInput="Test removing added slide" stepKey="commentAddedSlide"/>
         <actionGroup ref="addSlide" stepKey="addNewSlide" />
+        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelAfterAdd">
+            <argument name="section" value="SlideOnBackend"/>
+            <argument name="targetIndex" value="2"/>
+        </actionGroup>
         <!-- Fill first slide data -->
         <comment userInput="Fill second slide data." stepKey="fillSlide2"/>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="inputSlideColorWhite">

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

@@ -484,6 +484,10 @@
         <!-- Add second slide -->
         <comment userInput="Add second slide" stepKey="addSecondSlide"/>
         <actionGroup ref="addSlide" stepKey="addSlide"/>
+        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelAfterAddSlide">
+            <argument name="section" value="SlideOnBackend"/>
+            <argument name="targetIndex" value="2"/>
+        </actionGroup>
         <actionGroup ref="addTextToTinyMCE" stepKey="addTextToTinyMCE2">
             <argument name="property" value="PageBuilderSlideItemContent_Slide2"/>
             <argument name="section" value="SlideOnConfigurationPanel"/>
@@ -599,7 +603,7 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
             <argument name="group" value="PageBuilderSliderContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToContainerAndExpectEditPanel" stepKey="dragSliderToColumn">
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragSliderToColumn">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="2" />
@@ -861,6 +865,10 @@
         <!-- Add second slide -->
         <comment userInput="Add second slide" stepKey="addSecondSlide"/>
         <actionGroup ref="addSlide" stepKey="addSlide"/>
+        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelAfterAdd">
+            <argument name="section" value="SlideOnBackend"/>
+            <argument name="targetIndex" value="2"/>
+        </actionGroup>
         <actionGroup ref="addTextToTinyMCE" stepKey="enterMessageText2">
             <argument name="property" value="PageBuilderSlideItemContent_Slide2"/>
             <argument name="section" value="SlideOnConfigurationPanel"/>
@@ -1247,7 +1255,7 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupLayout">
             <argument name="group" value="PageBuilderSliderContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToContainer" stepKey="dragSliderOntoColumnAndExpectEditPanel">
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragSliderOntoColumn">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="2" />
@@ -1478,7 +1486,6 @@
         <!-- Add 2nd Slide -->
         <comment userInput="Add 2nd Slide" stepKey="commentAddSlide"/>
         <actionGroup ref="addSlide" stepKey="addSecondSlide"/>
-        <actionGroup ref="closeEditPanelSettings" stepKey="closeSlideEditPanel2"/>
         <!-- Validate Slide 2 Is Shown -->
         <comment userInput="Validate Slide 2 Is Shown" stepKey="commentValidateStage2"/>
         <seeElement selector="{{SliderOnStage.slideNavigationDot('1', '2')}}" stepKey="seeSecondDot"/>
@@ -1544,6 +1551,10 @@
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <actionGroup ref="addSlide" stepKey="addSlide"/>
+        <actionGroup ref="openPageBuilderEditPanelSmallByIndex" stepKey="openEditPanelAfterDrop">
+            <argument name="section" value="SlideOnBackend"/>
+            <argument name="targetIndex" value="2"/>
+        </actionGroup>
         <actionGroup ref="fillOutColorPicker" stepKey="fillOutSlideTwoColour">
             <argument name="colorCode" value="PageBuilderBackgroundColorProperty_3C3C3C"/>
         </actionGroup>

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

@@ -764,7 +764,7 @@
         <actionGroup ref="expandPageBuilderPanelGroup" stepKey="expandGroupInteractive">
             <argument name="group" value="PageBuilderVideoContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToContainerAndExpectEditPanel" stepKey="dragVideoToColumn">
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragVideoToColumn">
             <argument name="contentType" value="PageBuilderVideoContentType"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="2" />