MC-3653: Can Drag & Drop Child Content Types Into Hidden Content Types

- Resolve CR comments in tests

Author: davemacaulay

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

@@ -142,6 +142,7 @@
             <argument name="containerOffsetXCoordinate" defaultValue="null" type="string"/>
             <argument name="containerOffsetYCoordinate" defaultValue="null" type="string"/>
         </arguments>
+        <comment userInput="moveContentTypeToContainer" stepKey="comment"/>
         <waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
         <moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
         <waitForPageLoad time="30" stepKey="waitForAnimation"/>
@@ -151,27 +152,12 @@
         <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
         <waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/>
     </actionGroup>
-    <actionGroup name="cannotMoveContentTypeToContainer">
+    <actionGroup name="cannotMoveContentTypeToContainer" extends="moveContentTypeToContainer">
         <arguments>
-            <argument name="contentType"/>
-            <argument name="contentTypeIndex" defaultValue="1" type="string"/>
-            <argument name="containerTargetType"/>
-            <argument name="containerTargetIndex" defaultValue="1" type="string"/>
-            <argument name="offsetXCoordinate" defaultValue="10" type="string"/>
-            <argument name="offsetYCoordinate" defaultValue="0" type="string"/>
-            <argument name="containerOffsetXCoordinate" defaultValue="null" type="string"/>
-            <argument name="containerOffsetYCoordinate" defaultValue="null" type="string"/>
             <argument name="positionInContainer" defaultValue="1" type="string"/>
         </arguments>
-        <waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
-        <moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex(contentType.role, contentTypeIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
-        <waitForPageLoad time="30" stepKey="waitForAnimation"/>
-        <waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForOptions"/>
-        <waitForElementVisible selector="{{PageBuilderContentTypeOptionsMenu.contentTypeMoveByIndex(contentType.role, contentTypeIndex)}}" stepKey="waitForEditButton"/>
-        <dragAndDrop selector1="{{PageBuilderContentTypeOptionsMenu.contentTypeMoveByIndex(contentType.role, contentTypeIndex)}}" selector2="{{PageBuilderStage.contentTypeContainer(containerTargetType.role, containerTargetIndex)}}"  x="{{containerOffsetXCoordinate}}" y="{{containerOffsetYCoordinate}}" stepKey="moveContentTypeIntoContainer"/>
-        <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
-        <waitForElementVisible time="30" selector="{{PageBuilderStage.contentTypeInStageByIndex(containerTargetType.role, containerTargetIndex)}}" stepKey="waitForContentTypeStage"/>
-        <dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentType.role, contentTypeIndex)}}" stepKey="dontSeeContentTypeInContainer"/>
+        <comment userInput="cannotMoveContentTypeToContainer" stepKey="comment"/>
+        <dontSeeElementInDOM selector="{{PageBuilderStage.contentTypeInsideContainerStage(containerTargetType.role, containerTargetIndex, positionInContainer, contentType.role, contentTypeIndex)}}" stepKey="dontSeeContentTypeInContainer" after="waitForContentTypeInStage"/>
     </actionGroup>
     <actionGroup name="dragContentTypeNextToExistingContentType">
         <arguments>

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

@@ -1800,7 +1800,7 @@
     <test name="ValidateCannotMoveContentTypeIntoHiddenRow">
         <annotations>
             <features value="PageBuilder"/>
-            <stories value="Text"/>
+            <stories value="Row"/>
             <title value="Row whilst hidden doesnt receive drop events"/>
             <description value="A user isn't able to move existing content types into a hidden row"/>
             <severity value="MAJOR"/>

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

@@ -1132,7 +1132,7 @@
     <test name="ValidateCannotMoveContentTypeIntoHiddenTab">
         <annotations>
             <features value="PageBuilder"/>
-            <stories value="Text"/>
+            <stories value="Tab"/>
             <title value="Tab whilst hidden doesnt receive drop events"/>
             <description value="A user isn't able to move existing content types into a hidden tab item"/>
             <severity value="MAJOR"/>