Merge pull request #358 from magento-engcom/2.4-develop-express-lane-prs

Update action group names according to changes in Magento 2 CE

Author: davemacaulay

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

@@ -31,7 +31,7 @@
         <conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
         <waitForPageLoad time="30" stepKey="waitForSectionToExpand"/>
     </actionGroup>
-    <actionGroup name="saveCatalogCategory" extends="saveCategoryForm">
+    <actionGroup name="saveCatalogCategory" extends="SaveCategoryFormActionGroup">
         <!-- Move to CE: Fix CE action group -->
         <waitForElementVisible selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="waitForSaveCategoryButton" before="saveCategory"/>
         <waitForPageLoad stepKey="waitForPageLoad" after="saveCategory"/>

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

@@ -79,7 +79,7 @@
         <before>
             <createData entity="_emptyCmsBlock" stepKey="createPreReqBlock" after="loginAsAdmin"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage">
+            <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
                 <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
             </actionGroup>
         </before>
@@ -91,7 +91,7 @@
         <seeElement selector="{{PageBuilderStage.stageWrapper}}" stepKey="seeElementPageBuilderStage"/>
         <dontSeeElementInDOM selector="{{CmsNewBlockBlockBasicFieldsSection.content_textarea}}" stepKey="dontSeeContentAreaInDOM"/>
         <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
-        <actionGroup ref="navigateToCreatedCMSBlockPage" stepKey="navigateToCreatedCMSBlockPage">
+        <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
             <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
         </actionGroup>
         <seeElementInDOM selector="{{CmsNewBlockBlockBasicFieldsSection.content_textarea}}" stepKey="seeContentAreaInDOM"/>

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

@@ -31,7 +31,7 @@
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
         <!--Create CMS Page using PageBuilder-->
-        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage1">
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
             <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
         </actionGroup>
         <waitForElementVisible selector="{{PageBuilderPanel.layoutMenuSection}}" stepKey="waitForPageBuilderDisplay"/>
@@ -50,7 +50,7 @@
         <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="saveCMSWithPageBuilderContent"/>
         <!--Enable WYSIWYG-->
         <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-        <actionGroup ref="navigateToCreatedCMSPage" stepKey="navigateToContentCreatedCMSPage2">
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage2">
             <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
         </actionGroup>
         <actionGroup ref="verifyPageBuilderVisibleOnPage" stepKey="verifyPageBuilderVisibleOnCMSPage"/>
@@ -116,11 +116,11 @@
         </actionGroup>
         <!-- Use Full Width layout -->
         <comment userInput="Set Layout to Page - Full Width" stepKey="commentSetLayout"/>
-        <actionGroup ref="setLayout" stepKey="setFullWidthLayout">
+        <actionGroup ref="SetLayoutActionGroup" stepKey="setFullWidthLayout">
             <argument name="designSection" value="CmsDesignSection"/>
             <argument name="layoutOption" value="PageBuilderFullWidthLayout.cms"/>
         </actionGroup>
-        <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <!-- Check that description is full width on storefront -->
         <comment userInput="Check that description is full width on storefront" stepKey="commentSeeDescriptionFullWidth"/>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
@@ -175,11 +175,11 @@
         </actionGroup>
         <!-- Use Category - Full Width layout -->
         <comment userInput="Set Layout to Category - Full Width" stepKey="commentSetLayout"/>
-        <actionGroup ref="setLayout" stepKey="setCategoryFullWidthLayout">
+        <actionGroup ref="SetLayoutActionGroup" stepKey="setCategoryFullWidthLayout">
             <argument name="designSection" value="CmsDesignSection"/>
             <argument name="layoutOption" value="PageBuilderFullWidthLayout.category"/>
         </actionGroup>
-        <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <!-- Check that content is displayed on storefront with the category full width layout -->
         <comment userInput="Check that content is displayed on storefront with the product full width layout" stepKey="commentSeeContent"/>
         <openNewTab stepKey="openNewTab"/>
@@ -190,11 +190,11 @@
         <!-- Use Product - Full Width layout -->
         <comment userInput="Set Layout to Product - Full Width" stepKey="commentSetLayout2"/>
         <switchToNextTab stepKey="switchToNextTab"/>
-        <actionGroup ref="setLayout" stepKey="setProductFullWidthLayout">
+        <actionGroup ref="SetLayoutActionGroup" stepKey="setProductFullWidthLayout">
             <argument name="designSection" value="CmsDesignSection"/>
             <argument name="layoutOption" value="PageBuilderFullWidthLayout.product"/>
         </actionGroup>
-        <actionGroup ref="saveAndContinueEditCmsPage" stepKey="saveAndContinueEditCmsPage2"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
         <!-- Check that content is displayed on storefront with the product full width layout -->
         <comment userInput="Check that content is displayed on storefront with the product full width layout" stepKey="commentSeeContent2"/>
         <switchToNextTab stepKey="switchToNextTab1"/>

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

@@ -39,10 +39,10 @@
         <before>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedCategory">
+            <actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedCategory">
                 <argument name="Category" value="$$createCategory$$"/>
             </actionGroup>
-            <actionGroup ref="expandAdminProductSection" stepKey="expandAdminProductSection"/>
+            <actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandAdminProductSection"/>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
@@ -52,10 +52,10 @@
         <seeElement selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" stepKey="seePageBuilderButton"/>
         <dontSeeElementInDOM selector="{{CategoryContentSection.descriptionTextArea}}" stepKey="dontSeeDescriptionAreaInDOM"/>
         <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
-        <actionGroup ref="navigateToCreatedCategory" stepKey="navigateToCreatedCategory">
+        <actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedCategory">
             <argument name="Category" value="$$createCategory$$"/>
         </actionGroup>
-        <actionGroup ref="expandAdminProductSection" stepKey="expandAdminProductSection"/>
+        <actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandAdminProductSection"/>
         <seeElementInDOM selector="{{CategoryContentSection.descriptionTextArea}}" stepKey="seeDescriptionAreaInDOM"/>
         <dontSeeElementInDOM selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" stepKey="dontSeePageBuilderButton"/>
     </test>