MC-31892: Attribute sets not preserving attribute values when set is changed

Author: tsviklinskyi

app/code/Magento/Catalog/Test/Mftf/Test/AdminChangeProductAttributeGroupTest.xml

@@ -26,21 +26,21 @@
             <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
             <createData entity="CatalogAttributeSet" stepKey="createSecondAttributeSet"/>
 
-            <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
             <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createAttributeSet.attribute_set_id$/"
                       stepKey="onAttributeSetEdit"/>
-            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
+            <actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignAttributeToGroup">
                 <argument name="group" value="Product Details"/>
                 <argument name="attribute" value="$createProductAttribute.attribute_code$"/>
             </actionGroup>
-            <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+            <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveAttributeSet"/>
             <amOnPage url="{{AdminProductAttributeSetEditPage.url}}/$createSecondAttributeSet.attribute_set_id$/"
                       stepKey="onSecondAttributeSetEdit"/>
-            <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToContentGroup">
+            <actionGroup ref="AssignAttributeToGroupActionGroup" stepKey="assignAttributeToContentGroup">
                 <argument name="group" value="Content"/>
                 <argument name="attribute" value="$createProductAttribute.attribute_code$"/>
             </actionGroup>
-            <actionGroup ref="SaveAttributeSet" stepKey="saveSecondAttributeSet"/>
+            <actionGroup ref="SaveAttributeSetActionGroup" stepKey="saveSecondAttributeSet"/>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
@@ -51,8 +51,8 @@
             <actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductsFilter"/>
 
             <!-- Reindex invalidated indices after product attribute has been created/deleted -->
-            <actionGroup ref="CliRunReindexUsingCronJobsActionGroup" stepKey="reindexInvalidatedIndices"/>
-            <actionGroup ref="logout" stepKey="logout"/>
+            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
         <actionGroup ref="SearchForProductOnBackendActionGroup" stepKey="searchForSimpleProduct">
@@ -63,14 +63,14 @@
             <argument name="product" value="$createSimpleProduct$"/>
         </actionGroup>
 
-        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectAttributeSet">
+        <actionGroup ref="AdminProductPageSelectAttributeSetActionGroup" stepKey="selectAttributeSet">
             <argument name="attributeSetName" value="$createAttributeSet.attribute_set_name$"/>
         </actionGroup>
         <waitForText userInput="$createProductAttribute.default_frontend_label$" stepKey="seeAttributeInForm"/>
         <fillField selector="{{AdminProductFormSection.attributeRequiredInput($createProductAttribute.attribute_code$)}}"
                    userInput="test"
                    stepKey="fillProductAttributeValue"/>
-        <actionGroup ref="AdminProductPageSelectAttributeSet" stepKey="selectSecondAttributeSet">
+        <actionGroup ref="AdminProductPageSelectAttributeSetActionGroup" stepKey="selectSecondAttributeSet">
             <argument name="attributeSetName" value="$createSecondAttributeSet.attribute_set_name$"/>
         </actionGroup>
         <actionGroup ref="ExpandAdminProductSectionActionGroup" stepKey="expandContentSection"/>