MC-4409: Convert UpdateProductAttributeEntityTest to MFTF

- Adding "waitForPageLoad" action to the Action Group.
- Adding clean up steps to the "after" block of the Test.
- Fixing the name of the "createData" reference. There is a camel-casing issue with the original name.

Author: ivy00johns

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductAttributeSetActionGroup.xml

@@ -62,5 +62,6 @@
         <fillField selector="{{AdminProductAttributeSetGridSection.filter}}" userInput="{{name}}" stepKey="filterByName"/>
         <click selector="{{AdminProductAttributeSetGridSection.searchBtn}}" stepKey="clickSearch"/>
         <click selector="{{AdminProductAttributeSetGridSection.nthRow('1')}}" stepKey="clickFirstRow"/>
+        <waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
     </actionGroup>
 </actionGroups>

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

@@ -5,6 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateDropdownProductAttributeVisibleInStorefrontAdvancedSearchFormTest">
@@ -17,6 +18,7 @@
             <severity value="CRITICAL"/>
             <group value="mtf_migrated"/>
         </annotations>
+
         <before>
             <!-- Create product attribute with 2 options -->
             <createData entity="productDropDownAttributeNotSearchable" stepKey="attribute"/>
@@ -26,44 +28,58 @@
             <createData entity="productAttributeOption2" stepKey="option2">
                 <requiredEntity createDataKey="attribute"/>
             </createData>
+
             <!-- Create product attribute set -->
             <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
         <!-- Filter product attribute set by attribute set name -->
         <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
         <actionGroup ref="FilterProductAttributeSetGridByAttributeSetName" stepKey="filterProductAttrSetGridByAttrSetName">
             <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
         </actionGroup>
+
         <!-- Assert created attribute in an unassigned attributes -->
         <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassignedAttr"/>
+
         <!-- Assign attribute in the group -->
         <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
             <argument name="group" value="Product Details"/>
             <argument name="attribute" value="$$attribute.attribute_code$$"/>
         </actionGroup>
         <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
         <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+
         <!-- Go to Product Attribute Grid page -->
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="$$attribute.attribute_code$$" stepKey="fillAttrCodeField" />
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearchBtn" />
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="chooseFirstRow" />
+
         <!-- Change attribute property: Frontend Label -->
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillDefaultLabel"/>
+
         <!-- Change attribute property: Use in Search >Yes -->
         <scrollToTopOfPage stepKey="scrollToTabs"/>
         <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
         <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" stepKey="waitTabLoad"/>
         <selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="Yes" stepKey="seeInSearch"/>
+
         <!-- Change attribute property: Visible In Advanced Search >No -->
         <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.VisibleInAdvancedSearch}}" stepKey="waitTabLoad2"/>
         <selectOption selector="{{AdvancedAttributePropertiesSection.VisibleInAdvancedSearch}}" userInput="No" stepKey="dontSeeInAdvancedSearch"/>
+
         <!-- Save the new product attributes -->
         <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+
         <!-- Flash cache -->
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Go to store's advanced catalog search page -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <dontSeeElement selector="{{StorefrontCatalogSearchAdvancedFormSection.AttributeByCode('$$attribute.attribute_code$$')}}" stepKey="dontSeeAttribute"/>

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

@@ -5,6 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateMultipleSelectProductAttributeVisibleInStorefrontAdvancedSearchFormTest">
@@ -17,53 +18,68 @@
             <severity value="CRITICAL"/>
             <group value="mtf_migrated"/>
         </annotations>
+
         <before>
             <!-- Create a multiple select product attribute with two options -->
-            <createData entity="productAttributeMultiSelectTwoOptionsNotSearchable" stepKey="attribute"/>
+            <createData entity="productAttributeMultiselectTwoOptionsNotSearchable" stepKey="attribute"/>
             <createData entity="productAttributeOption1" stepKey="option1">
                 <requiredEntity createDataKey="attribute"/>
             </createData>
             <createData entity="productAttributeOption2" stepKey="option2">
                 <requiredEntity createDataKey="attribute"/>
             </createData>
+
             <!-- Create product attribute set -->
             <createData entity="CatalogAttributeSet" stepKey="createAttributeSet"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
         <!-- Filter product attribute set by attribute set name -->
         <amOnPage url="{{AdminProductAttributeSetGridPage.url}}" stepKey="amOnAttributeSetPage"/>
         <actionGroup ref="FilterProductAttributeSetGridByAttributeSetName" stepKey="filterProductAttrSetGridByAttrSetName">
             <argument name="name" value="$$createAttributeSet.attribute_set_name$$"/>
         </actionGroup>
+
         <!-- Assert created attribute in an unassigned attributes -->
         <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.unassignedAttributesTree}}" stepKey="seeAttributeInUnassignedAttr"/>
+
         <!-- Assign attribute in the group -->
         <actionGroup ref="AssignAttributeToGroup" stepKey="assignAttributeToGroup">
             <argument name="group" value="Product Details"/>
             <argument name="attribute" value="$$attribute.attribute_code$$"/>
         </actionGroup>
         <see userInput="$$attribute.attribute_code$$" selector="{{AdminProductAttributeSetEditSection.groupTree}}" stepKey="seeAttributeInGroup"/>
         <actionGroup ref="SaveAttributeSet" stepKey="saveAttributeSet"/>
+
         <!-- Go to Product Attribute Grid page -->
         <amOnPage url="{{AdminProductAttributeGridPage.url}}" stepKey="navigateToProductAttributeGrid"/>
         <fillField selector="{{AdminProductAttributeGridSection.FilterByAttributeCode}}" userInput="$$attribute.attribute_code$$" stepKey="fillAttrCodeField" />
         <click selector="{{AdminProductAttributeGridSection.Search}}" stepKey="clickSearchBtn" />
         <click selector="{{AdminProductAttributeGridSection.FirstRow}}" stepKey="chooseFirstRow" />
+
         <!-- Change attribute property: Frontend Label -->
         <fillField selector="{{AttributePropertiesSection.DefaultLabel}}" userInput="{{productDropDownAttribute.attribute_code}}" stepKey="fillDefaultLabel"/>
+
         <!-- Change attribute property: Use in Search >Yes -->
         <scrollToTopOfPage stepKey="scrollToTabs"/>
         <click selector="{{StorefrontPropertiesSection.StoreFrontPropertiesTab}}" stepKey="clickStorefrontPropertiesTab"/>
         <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" stepKey="waitTabLoad"/>
         <selectOption selector="{{AdvancedAttributePropertiesSection.UseInSearch}}" userInput="Yes" stepKey="seeInSearch"/>
+
         <!-- Change attribute property: Visible In Advanced Search >No -->
         <waitForElementVisible selector="{{AdvancedAttributePropertiesSection.VisibleInAdvancedSearch}}" stepKey="waitTabLoad2"/>
         <selectOption selector="{{AdvancedAttributePropertiesSection.VisibleInAdvancedSearch}}" userInput="No" stepKey="dontSeeInAdvancedSearch"/>
+
         <!-- Save the new product attributes -->
         <click selector="{{AttributePropertiesSection.Save}}" stepKey="clickSave"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSuccessMessage"/>
+
         <!-- Flash cache -->
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Go to store's advanced catalog search page -->
         <actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroup"/>
         <dontSeeElement selector="{{StorefrontCatalogSearchAdvancedFormSection.AttributeByCode('$$attribute.attribute_code$$')}}" stepKey="dontSeeAttribute"/>