Refactoring

Author: atwix-framework

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminNotSuccessLoginActionGroup.xml renamed to app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertAdminLoginErrorMessageActionGroup.xml

@@ -8,12 +8,13 @@
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertAdminNotSuccessLoginActionGroup">
+    <actionGroup name="AssertAdminLoginErrorMessageActionGroup">
         <arguments>
             <argument name="message" type="string" defaultValue="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
+            <argument name="messageType" type="string" defaultValue="error" />
         </arguments>
         <waitForPageLoad stepKey="waitForPageReload"/>
-        <see selector="{{AdminLoginFormSection.error}}" userInput="{{message}}"
+        <see selector="{{AdminLoginMessagesSection.messageByType(messageType)}}" userInput="{{message}}"
              stepKey="seeLoginAdminError"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnBackendActionGroup.xml renamed to app/code/Magento/Backend/Test/Mftf/ActionGroup/AssertMessageOnAdminActionGroup.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="AssertMessageOnBackendActionGroup">
+    <actionGroup name="AssertMessageOnAdminActionGroup">
         <arguments>
             <argument name="message" type="string" defaultValue="The password entered for the current user is invalid. Verify the password and try again." />
             <argument name="messageType" type="string" defaultValue="error" />

app/code/Magento/Backend/Test/Mftf/Section/AdminLoginFormSection.xml

@@ -12,6 +12,5 @@
         <element name="username" type="input" selector="#username"/>
         <element name="password" type="input" selector="#login"/>
         <element name="signIn" type="button" selector=".actions .action-primary" timeout="30"/>
-        <element name="error" type="text" selector=".message.message-error.error"/>
     </section>
 </sections>

app/code/Magento/Integration/Test/Mftf/ActionGroup/AssertSaveIntegrationActionGroup.xml renamed to app/code/Magento/Integration/Test/Mftf/ActionGroup/AdminSaveIntegrationActionGroup.xml

@@ -7,7 +7,7 @@
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="AssertSaveIntegrationActionGroup">
+    <actionGroup name="AdminSaveIntegrationActionGroup">
         <click selector="{{AdminNewIntegrationSection.save}}" stepKey="saveIntegration"/>
         <waitForPageLoad stepKey="waitForSaveResultLoad"/>
     </actionGroup>

app/code/Magento/Security/Test/Mftf/Test/AdminLockAdminUserWhenCreatingNewIntegrationTest.xml

@@ -33,44 +33,44 @@
         <actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldFirstAttempt">
             <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
         </actionGroup>
-        <actionGroup ref="AssertSaveIntegrationActionGroup" stepKey="saveIntegrationFirstAttempt"/>
-        <actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkFirstSaveIntegrationError"/>
+        <actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationFirstAttempt"/>
+        <actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkFirstSaveIntegrationError"/>
 
         <actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldSecondAttempt">
             <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
         </actionGroup>
-        <actionGroup ref="AssertSaveIntegrationActionGroup" stepKey="saveIntegrationSecondAttempt"/>
-        <actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkSecondSaveIntegrationError"/>
+        <actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationSecondAttempt"/>
+        <actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkSecondSaveIntegrationError"/>
 
         <actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldThirdAttempt">
             <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
         </actionGroup>
-        <actionGroup ref="AssertSaveIntegrationActionGroup" stepKey="saveIntegrationThirdAttempt"/>
-        <actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkThirdSaveIntegrationError"/>
+        <actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationThirdAttempt"/>
+        <actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkThirdSaveIntegrationError"/>
 
         <actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldFourthAttempt">
             <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
         </actionGroup>
-        <actionGroup ref="AssertSaveIntegrationActionGroup" stepKey="saveIntegrationFourthAttempt"/>
-        <actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkFourthSaveIntegrationError"/>
+        <actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationFourthAttempt"/>
+        <actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkFourthSaveIntegrationError"/>
 
         <actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldFifthAttempt">
             <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
         </actionGroup>
-        <actionGroup ref="AssertSaveIntegrationActionGroup" stepKey="saveIntegrationFifthAttempt"/>
-        <actionGroup ref="AssertMessageOnBackendActionGroup" stepKey="checkFifthSaveIntegrationError"/>
+        <actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationFifthAttempt"/>
+        <actionGroup ref="AssertMessageOnAdminActionGroup" stepKey="checkFifthSaveIntegrationError"/>
 
         <!-- Last invalid current password save integration attempt and check logout error -->
         <actionGroup ref="AdminFillIntegrationRequiredFieldsActionGroup" stepKey="fillFieldLastAttempt">
             <argument name="currentAdminPassword" value="{{_ENV.MAGENTO_ADMIN_PASSWORD}}INVALID" />
         </actionGroup>
-        <actionGroup ref="AssertSaveIntegrationActionGroup" stepKey="saveIntegrationLastAttempt"/>
-        <actionGroup ref="AssertAdminNotSuccessLoginActionGroup" stepKey="checkFifthError">
+        <actionGroup ref="AdminSaveIntegrationActionGroup" stepKey="saveIntegrationLastAttempt"/>
+        <actionGroup ref="AssertAdminLoginErrorMessageActionGroup" stepKey="checkFifthError">
             <argument name="message" value="Your account is temporarily disabled. Please try again later."/>
         </actionGroup>
 
         <!-- Try to login as admin and check error -->
         <actionGroup ref="LoginAsAdmin" stepKey="loginAsLockedAdmin"/>
-        <actionGroup ref="AssertAdminNotSuccessLoginActionGroup" stepKey="checkLoginError"/>
+        <actionGroup ref="AssertAdminLoginErrorMessageActionGroup" stepKey="checkLoginError"/>
     </test>
 </tests>