ACP2E-1753: cleanup on MC-14271

Author: alzota

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>