refactoring

Author: DmitryTsymbal

app/code/Magento/Customer/Test/Mftf/ActionGroup/StoreFrontCustomerChangeEmailWithIncorrectActionGroup.xml

@@ -10,42 +10,52 @@
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SecureChangingCustomerEmailTest">
         <annotations>
-            <features value="Security" />
-            <stories value="Changing Customer's email" />
-            <title value="Changing Customer Email Test" />
-            <description value="Changing Customer's email with correct and wrong passwords" />
-            <group value="security" />
-            <group value="mtf_migrated" />
+            <features value="Security"/>
+            <stories value="Changing Customer's email"/>
+            <title value="Changing Customer Email Test"/>
+            <description value="Changing Customer's email with correct and wrong passwords"/>
+            <group value="security"/>
+            <group value="mtf_migrated"/>
         </annotations>
 
         <before>
-            <createData entity="Simple_US_Customer" stepKey="customer" />
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
         </before>
         <after>
-            <deleteData createDataKey="customer" stepKey="deleteCustomer" />
+            <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
         </after>
 
         <!-- TEST BODY -->
         <!-- Go to storefront home page -->
-        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage" />
+        <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="openStoreFrontHomePage"/>
         <!-- Login as created customer -->
         <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-            <argument name="Customer" value="$$customer$$" />
+            <argument name="Customer" value="$$customer$$"/>
         </actionGroup>
         <!-- Navigate to "Account Information" tab First Time-->
-        <actionGroup ref="StorefrontOpenCustomerAccountInfoEditPageActionGroup" stepKey="goToCustomerEditPageFirstTime" />
+        <actionGroup ref="StorefrontOpenCustomerAccountInfoEditPageActionGroup" stepKey="goToCustomerEditPageFirstTime"/>
         <!-- Checking Email checkbox, entering new email, saving with correct password -->
         <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailCorrectAttempt">
-            <argument name="email" value="$$customer.email$$" />
-            <argument name="password" value="$$customer.password$$" />
+            <argument name="email" value="$$customer.email$$"/>
+            <argument name="password" value="$$customer.password$$"/>
+        </actionGroup>
+        <!-- See Success Notify-->
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="seeSuccessMessage">
+            <argument name="message" value="You saved the account information."/>
         </actionGroup>
         <!-- Navigate to "Account Information" tab Second Time-->
         <actionGroup ref="StorefrontOpenCustomerAccountInfoEditPageActionGroup" stepKey="goToCustomerEditPageSecondTime" />
         <!-- Checking Email checkbox, entering new email, saving with incorrect password -->
-        <actionGroup ref="StoreFrontCustomerChangeEmailWithIncorrectActionGroup" stepKey="changeEmailWrongAttempt">
-            <argument name="email" value="$$customer.email$$" />
-            <argument name="password" value="{incorrect.password}" />
+        <actionGroup ref="StorefrontCustomerChangeEmailActionGroup" stepKey="changeEmailWrongAttempt">
+            <argument name="email" value="$$customer.email$$"/>
+            <argument name="password" value="{incorrect.password}"/>
+        </actionGroup>
+        <!-- See Failure Message-->
+        <actionGroup ref="AssertMessageCustomerChangeAccountInfoActionGroup" stepKey="seeFailureMessage">
+            <argument name="message" value="The password doesn't match this account. Verify the password and try again."/>
+            <argument name="messageType" value="error"/>
         </actionGroup>
+
         <!-- END TEST BODY -->
 
      </test>

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

@@ -14,13 +14,15 @@
             <data name="customer/data/current_password" xsi:type="string">123123^q</data>
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerInfoSuccessSavedMessage" />
             <constraint name="Magento\Security\Test\Constraint\AssertCustomerEmailChanged" />
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
         </variation>
         <variation name="SecureChangingEmailV2" summary="Change Email checkbox is checked, enter new email, wrong password">
             <data name="tag" xsi:type="string">severity:S2</data>
             <data name="initialCustomer/dataset" xsi:type="string">default</data>
             <data name="customer/data/email" xsi:type="string">JaneDoe_%isolation%@example.com</data>
             <data name="customer/data/current_password" xsi:type="string">123123123</data>
             <constraint name="Magento\Customer\Test\Constraint\AssertChangePasswordFailMessage" />
+            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
         </variation>
     </testCase>
 </config>