#512: User edits cms block content in full-screen mode only - merged a merge cms branch

Lukasz Borowiec · Lukasz Borowiec · commit b623b0ed4b39 · 2020-08-11T11:08:12.000+02:00
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockCreateAndApplyTemplate.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockCreateAndApplyTemplate.xml
@@ -25,7 +25,7 @@
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSBlockPage" value="$$createCMSPage$$"/>
             </actionGroup>
-            <remove keyForRemoval="switchToPageBuilderStage"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
         </before>
         <actionGroup ref="savePageBuilderTemplate" stepKey="savePageBuilderTemplate">
             <argument name="baseContent" value="{{BlockNewPagePageActionsSection.saveBlock}}"/>
@@ -34,7 +34,7 @@
         <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSPage">
             <argument name="CMSBlockPage" value="$$createCMSPage$$"/>
         </actionGroup>
-        <remove keyForRemoval="switchToPageBuilderStage"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
         <actionGroup ref="confirmApplyFromPageBuilderApplyTemplateSlideOut" stepKey="confirmApplyFromPageBuilderApplyTemplateSlideOut">
             <argument name="baseContent" value="{{BlockNewPagePageActionsSection.saveBlock}}"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml
@@ -32,17 +32,16 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeBackgroundColorSlide2StageAfterSave"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml
@@ -26,12 +26,11 @@
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
-            <comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
         </after>
-        <actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml
@@ -26,12 +26,11 @@
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
-            <comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
         </after>
-        <actionGroup ref="openPageBuilderFullScreen" stepKey="openPageBuilderFullScreen"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
@@ -30,17 +30,16 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="see2ButtonItemsStageAfterSave"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
@@ -30,18 +30,16 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreenAfterDelete"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProductAfterDelete"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSectionAfterDelete"/>
         <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescriptionAfterDelete"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
@@ -30,21 +30,19 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreenAfterDelete"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProductAfterDelete"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSectionAfterDelete"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescriptionAfterDelete"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescriptionAfterDelete"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="dontSeeDividerInStageAfterSave"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
@@ -30,17 +30,16 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="closeEditPanel"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
@@ -30,17 +30,16 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeBackgroundColorRow2StageAfterSave"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
@@ -30,17 +30,16 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeBackgroundColorOnEditPanel"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
@@ -30,7 +30,6 @@
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedProductEditPage">
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
-            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage" after="navigateToCreatedProductEditPage"/>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
             <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
         </before>
@@ -40,7 +39,6 @@
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct" after="exitPageBuilderFullScreen"/>
-        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
         <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
         <!-- Go to CMS Page and choose Block -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveButtonItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveButtonItemsTest.xml
@@ -27,15 +27,16 @@
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToAPageWithPageBuilder">
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
-            <comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct" before="logout"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory" after="deleteCreatedProduct"/>
         </after>
         <comment userInput="---merging to remove step---" stepKey="enterPageTitle"/>
+        <!-- Validate Stage -->
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveAndContinueEditCmsPage"/>
-        <comment userInput="---merging to remove step---" stepKey="switchToPageBuilderStage"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="switchToPageBuilderStage"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="seeAppearanceOnStageSecondButtons2"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
@@ -55,7 +56,7 @@
             <argument name="block" value="$$createPreReqBlock$$"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterBlock" after="searchBlockInGrid"/>
-        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen" after="saveEditPanelSettingsAfterBlock"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen1" after="saveEditPanelSettingsAfterBlock"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageAfterBlock" after="exitPageBuilderFullScreen"/>
         <!-- Validate CMS Page Storefront -->
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToStoreFront">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
@@ -33,17 +33,16 @@
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
             <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-            <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+            <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         </before>
         <after>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCreatedCategory"/>
             <comment userInput="---merging to remove step---" stepKey="NavigateToAndResetProductGridToDefaultView"/>
         </after>
-        <comment userInput="---merging to remove step---" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveCMSBlockActionGroup" stepKey="saveProduct"/>
         <comment userInput="---merging to remove step---" stepKey="expandAdminProductSection"/>
-        <comment userInput="---merging to remove step---" stepKey="openPageBuilderForDescription"/>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderForDescription"/>
         <!-- Go to CMS Page and choose Block -->
         <comment userInput="Go to CMS Page and choose Block" stepKey="commentGoToCMSPage" after="validateDividerPositionAfterSave"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage" after="commentGoToCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveTabItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveTabItemsTest.xml
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml
