Merge branch 'ACP2E-1753' of https://github.com/magento-l3/magento2ce into PR-05242023

Author: chittima

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

@@ -21,6 +21,7 @@
         <before>
             <!-- Login as admin -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
+            <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="openProductIndexPageBefore"/>
             <!-- remove the Filter From the page-->
             <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFilterFromProductIndex"/>
             <!--Create Category-->

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

@@ -29,6 +29,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="AdminProductCatalogPageOpenActionGroup" stepKey="openProductCatalogPage1"/>
+            <actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="selectAndDeleteProducts"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearFilterFromProductIndex"/>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>

app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteNewUserActionGroup.xml

@@ -16,7 +16,7 @@
             <argument name="userName" type="string" defaultValue="John"/>
         </arguments>
         <click stepKey="clickOnUser" selector="{{AdminDeleteUserSection.theUser(userName)}}"/>
-        <fillField stepKey="typeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <fillField stepKey="typeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
         <waitForPageLoad stepKey="waitForDeletePopupOpen" time="5"/>

app/code/Magento/User/Test/Mftf/Test/AdminDeleteOwnAdminUserAccountTest.xml

@@ -35,8 +35,9 @@
         <after>
             <!-- Delete New Admin User -->
             <actionGroup ref="AdminLoginActionGroup" stepKey="LoginAdmin"/>
-            <actionGroup ref="AdminDeleteUserViaCurlActionGroup" stepKey="deleteUser">
-                <argument name="user" value="$$user$$" />
+            <actionGroup ref="AdminOpenAdminUsersPageActionGroup" stepKey="goToAllUsersPage"/>
+            <actionGroup ref="AdminDeleteNewUserActionGroup" stepKey="deleteUser">
+                <argument name="userName" value="$$user.username$$"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
         </after>