Code refactoring

Author: kate-kyzyma

app/code/Magento/Config/Test/Mftf/ActionGroup/AdminExpandSecurityTabActionGroup.xml

@@ -12,5 +12,3 @@
     <conditionalClick selector="{{AdminSection.SecurityTab}}" dependentSelector="{{AdminSection.CheckIfTabExpand}}" visible="true" stepKey="openSecurityTab"/>
     </actionGroup>
 </actionGroups>
-
-

app/code/Magento/Config/Test/Mftf/ActionGroup/AdminOpenConfigAdminPageActionGroup.xml

@@ -8,7 +8,7 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminOpenConfigAdminPageActionGroup">
-        <amOnPage url="{{AdminConfigAdminPage.url}}" stepKey="goToAdminSectionPage"/>
+        <amOnPage url="{{AdminConfigAdminPage.url}}" stepKey="goToConfigAdminSectionPage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
-</actionGroups>
+</actionGroups>

app/code/Magento/Config/Test/Mftf/ActionGroup/AdminSetMaximumLoginFailuresToLockoutAccountActionGroup.xml

@@ -17,4 +17,3 @@
         <seeInField selector="{{AdminSection.MaximumLoginFailures}}" userInput="{{qty}}"  stepKey="seeNewValueInField"/>
     </actionGroup>
 </actionGroups>
-

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

@@ -127,20 +127,7 @@
     </entity>
     <entity name="adminUserIncorrectPassword" type="user">
         <data key="username">admin_user_with_correct_password</data>
-        <data key="firstname">John</data>
-        <data key="lastname">Doe</data>
-        <data key="email" unique="prefix">[email protected]</data>
         <data key="password">123123123q</data>
-        <data key="password_confirmation">123123123q</data>
-        <data key="interface_local">en_US</data>
-        <data key="interface_local_label">English (United States)</data>
-        <data key="is_active">true</data>
-        <data key="is_active_label">Active</data>
-        <data key="current_password">{{_ENV.MAGENTO_ADMIN_PASSWORD}}</data>
-        <data key="role">Administrators</data>
-        <array key="roles">
-            <item>1</item>
-        </array>
     </entity>
 <!--
     Since User delete action is performed via POST request we created this entity to be able to delete it.

app/code/Magento/User/Test/Mftf/Test/LockAdminUserEntityTest.xml renamed to app/code/Magento/User/Test/Mftf/Test/AdminLockAdminUserEntityTest.xml

@@ -33,7 +33,7 @@
         <actionGroup ref="AdminClickSaveButtonOnUserFormActionGroup" stepKey="saveNewUser"/>
 
         <!--Configure 'Maximum Login Failures to Lockout Account'-->
-        <actionGroup ref="AdminOpenConfigAdminPageActionGroup" stepKey="goToAdminSectionPage"/>
+        <actionGroup ref="AdminOpenConfigAdminPageActionGroup" stepKey="goToConfigAdminSectionPage"/>
         <actionGroup ref="AdminExpandSecurityTabActionGroup" stepKey="openSecurityTab"/>
         <actionGroup ref="AdminSetMaximumLoginFailuresToLockoutAccountActionGroup" stepKey="setMaximumLoginFailures"/>
         <actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveChanges"/>
@@ -68,4 +68,4 @@
         </actionGroup>
 
     </test>
-</tests>
+</tests>

dev/tests/functional/tests/app/Magento/User/Test/TestCase/LockAdminUserEntityTest.xml

@@ -24,6 +24,7 @@
             <data name="incorrectPassword" xsi:type="string">honey boo boo</data>
             <data name="attempts" xsi:type="string">7</data>
             <constraint name="Magento\User\Test\Constraint\AssertUserFailedLoginMessage" />
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
         </variation>
     </testCase>
 </config>