Adjusting action groups

Author: rogyar

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

@@ -11,8 +11,6 @@
     <actionGroup name="StorefrontCustomerResetPasswordActionGroup">
         <arguments>
             <argument name="email" type="string" />
-            <argument name="message" type="string" defaultValue="" />
-            <argument name="messageType" type="string" defaultValue="success" />
         </arguments>
 
         <amOnPage stepKey="amOnSignInPage" url="{{StorefrontCustomerSignInPage.url}}"/>
@@ -22,6 +20,16 @@
         <fillField stepKey="fillEmailField" userInput="{{email}}" selector="{{StorefrontForgotPasswordSection.email}}"/>
         <click stepKey="clickResetPassword" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
         <waitForPageLoad stepKey="waitForPageLoaded" />
+    </actionGroup>
+
+    <actionGroup name="AssertCustomerResetPasswordActionGroup">
+        <arguments>
+            <argument name="url" type="string"/>
+            <argument name="message" type="string" defaultValue="" />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+
+        <seeInCurrentUrl stepKey="seeInSignInPage" url="{{url}}"/>
         <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
         <see stepKey="seeMessage" userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}"/>
     </actionGroup>

app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordFailedTest.xml

@@ -28,10 +28,16 @@
 
         <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordFirstAttempt">
             <argument name="email" value="$$customer.email$$" />
+        </actionGroup>
+        <actionGroup ref="AssertCustomerResetPasswordActionGroup" stepKey="seePageWithSuccessMessage">
+            <argument name="url" value="{{StorefrontCustomerSignInPage.url}}"/>
             <argument name="message" value="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password."/>
         </actionGroup>
         <actionGroup ref="StorefrontCustomerResetPasswordActionGroup" stepKey="resetPasswordSecondAttempt">
             <argument name="email" value="$$customer.email$$" />
+        </actionGroup>
+        <actionGroup ref="AssertCustomerResetPasswordActionGroup" stepKey="seePageWithErrorMessage">
+            <argument name="url" value="{{StorefrontForgotPasswordPage.url}}"/>
             <argument name="message" value="We received too many requests for password resets. Please wait and try again later or contact [email protected]."/>
             <argument name="messageType" value="error" />
         </actionGroup>