Merge latest 2.4-develop

Author: lbajsarowicz

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

@@ -18,7 +18,7 @@
 
         <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
         <waitForPageLoad stepKey="waitForAdminUserPageLoad"/>
-        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.name)}}"/>
+        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.username)}}"/>
         <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
         <scrollToTopOfPage stepKey="scrollToTop"/>
         <click stepKey="clickToDeleteRole" selector="{{AdminDeleteUserSection.delete}}"/>

app/code/Magento/User/Test/Mftf/Data/UserData.xml

@@ -156,6 +156,7 @@
         <data key="interface_local_label">English (United States)</data>
         <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
         <data key="role">Administrators</data>
+        <data key="is_active">1</data>
         <array key="roles">
             <item>1</item>
         </array>
@@ -171,6 +172,7 @@
         <data key="interface_local_label">English (United States)</data>
         <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
         <data key="role">Administrators</data>
+        <data key="is_active">0</data>
         <array key="roles">
             <item>1</item>
         </array>

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

@@ -20,16 +20,16 @@
             <group value="mtf_migrated"/>
         </annotations>
         <after>
-            <actionGroup ref="LoginAsAdmin" stepKey="adminLogin"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
             <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteUser">
                 <argument name="user" value="activeAdmin"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
         <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
-        <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
-            <argument name="User" value="activeAdmin"/>
+        <actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createAdminUser">
+            <argument name="user" value="activeAdmin"/>
             <argument name="role" value="roleDefaultAdministrator"/>
         </actionGroup>
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutMasterAdmin"/>

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

@@ -19,22 +19,23 @@
             <group value="user"/>
             <group value="mtf_migrated"/>
         </annotations>
-        <before>
-            <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
-        </before>
 
-        <actionGroup ref="AdminCreateUserWithRoleAndIsInactiveActionGroup" stepKey="createAdminUser">
-            <argument name="User" value="inactiveAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="adminMasterLogin"/>
+        <actionGroup ref="AdminCreateUserWithRoleAndIsActiveActionGroup" stepKey="createAdminUser">
+            <argument name="user" value="inactiveAdmin"/>
             <argument name="role" value="roleDefaultAdministrator"/>
         </actionGroup>
         <amOnPage url="{{AdminUsersPage.url}}" stepKey="navigateToAdminUsersGrid"/>
         <actionGroup ref="AssertAdminUserIsInGridActionGroup" stepKey="assertAdminIsInGrid">
             <argument name="user" value="inactiveAdmin"/>
         </actionGroup>
-        <actionGroup ref="logout" stepKey="logoutMasterAdmin"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginToNewAdmin">
-            <argument name="adminUser" value="inactiveAdmin"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminMasterLogout"/>
+
+        <actionGroup ref="AdminLoginActionGroup" stepKey="adminNewLogin">
+            <argument name="username" value="{{inactiveAdmin.username}}"/>
+            <argument name="password" value="{{inactiveAdmin.password}}"/>
         </actionGroup>
         <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="seeUserErrorMessage" />
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="adminNewLogout"/>
     </test>
 </tests>

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

@@ -19,16 +19,15 @@
             <group value="user"/>
             <group value="mtf_migrated"/>
         </annotations>
-
         <before>
             <magentoCLI command="config:set admin/captcha/enable 0" stepKey="disableAdminCaptcha"/>
             <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches1"/>
-            <actionGroup ref="LoginAsAdmin" stepKey="logIn"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="adminLogin"/>
         </before>
         <after>
             <magentoCLI command="config:set admin/captcha/enable 1" stepKey="enableAdminCaptcha"/>
             <magentoCLI command="cache:clean config full_page" stepKey="cleanInvalidatedCaches"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logOut"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
         </after>
 
         <!--Create New User-->
@@ -48,23 +47,26 @@
 
         <!-- Log in to Admin Panel with incorrect password specified number of times-->
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsDefaultUser"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserFirstAttempt">
-            <argument name="adminUser" value="adminUserIncorrectPassword"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserFirstAttempt">
+            <argument name="username" value="{{adminUserIncorrectPassword.username}}"/>
+            <argument name="password" value="{{adminUserIncorrectPassword.password}}"/>
         </actionGroup>
         <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorFirstAttempt"/>
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserSecondAttempt">
-            <argument name="adminUser" value="adminUserIncorrectPassword"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserSecondAttempt">
+            <argument name="username" value="{{adminUserIncorrectPassword.username}}"/>
+            <argument name="password" value="{{adminUserIncorrectPassword.password}}"/>
         </actionGroup>
         <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorSecondAttempt"/>
 
         <!-- Log in to Admin Panel with correct password-->
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsNewUserThirdAttempt">
-            <argument name="adminUser" value="adminUserCorrectPassword"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsNewUserThirdAttempt">
+            <argument name="username" value="{{adminUserCorrectPassword.username}}"/>
+            <argument name="password" value="{{adminUserCorrectPassword.password}}"/>
         </actionGroup>
         <actionGroup ref="AssertMessageOnAdminLoginActionGroup" stepKey="checkLoginErrorThirdAttempt"/>
 
         <!--Login as default admin user-->
-        <actionGroup ref="LoginAsAdmin" stepKey="loginAsDefaultAdminUser"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsDefaultAdminUser"/>
 
         <!--Delete new User-->
         <actionGroup ref="AdminDeleteCustomUserActionGroup" stepKey="deleteNewUser">