Merge remote-tracking branch 'origin/2.4-develop-prs' into 2.4-develop-prs

Author: slavvka

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

@@ -21,9 +21,16 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
+            <magentoCLI command="config:set customer/password/password_reset_protection_type 3" stepKey="setProtectionOnEmail"/>
+            <magentoCLI command="config:set customer/password/min_time_between_password_reset_requests 30" stepKey="increaseThresholdBetweenRequests"/>
             <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
+            <!-- Preferred `Use system value` which is not available from CLI -->
+            <magentoCLI command="config:set customer/password/password_reset_protection_type 1" stepKey="setDefaultProtection"/>
+            <magentoCLI command="config:set customer/password/min_time_between_password_reset_requests 30" stepKey="setDefaultThresholdBetweenRequests"/>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 

app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml renamed to app/code/Magento/Customer/Test/Mftf/Test/StorefrontResetCustomerPasswordSuccessTest.xml

@@ -8,7 +8,7 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontCustomerForgotPasswordTest">
+    <test name="StorefrontResetCustomerPasswordSuccessTest">
         <annotations>
             <features value="Customer"/>
             <stories value="Customer Login"/>
@@ -21,23 +21,24 @@
         </annotations>
         <before>
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
+            <magentoCLI command="config:set customer/password/password_reset_protection_type 3" stepKey="setProtectionOnEmail"/>
             <magentoCLI command="config:set customer/password/max_number_password_reset_requests 30" stepKey="increaseLimit"/>
-            <magentoCLI command="config:set customer/password/min_time_between_password_reset_requests 1" stepKey="reduceTimeout"/>
+            <magentoCLI command="config:set customer/password/min_time_between_password_reset_requests 0" stepKey="reduceTimeout"/>
             <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
+            <!-- Preferred `Use system value` which is not available from CLI -->
             <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
+            <magentoCLI command="config:set customer/password/password_reset_protection_type 1" stepKey="setDefaultProtection"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="something" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickForgotPasswordLink" selector="{{StorefrontCustomerSignInFormSection.forgotPasswordLink}}"/>
-        <see stepKey="seePageTitle" userInput="Forgot Your Password" selector="{{StorefrontForgotPasswordSection.pageTitle}}"/>
-        <fillField stepKey="enterEmail" userInput="$$customer.email$$" selector="{{StorefrontForgotPasswordSection.email}}"/>
-        <click stepKey="clickResetPassword" selector="{{StorefrontForgotPasswordSection.resetMyPasswordButton}}"/>
-        <seeInCurrentUrl stepKey="seeInSignInPage" url="account/login"/>
-        <see stepKey="seeSuccessMessage" userInput="If there is an account associated with $$customer.email$$ you will receive an email with a link to reset your password." selector="{{StorefrontCustomerLoginMessagesSection.successMessage}}"/>
+        <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>
     </test>
 </tests>

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

@@ -8,4 +8,5 @@
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AddingProductWithExpiredSessionTest" extends="StorefrontAddProductToCartWithExpiredSessionTest" deprecated="Use StorefrontAddProductToCartWithExpiredSessionTest"/>
+    <test name="StorefrontCustomerForgotPasswordTest" extends="StorefrontResetCustomerPasswordSuccessTest" deprecated="Use StorefrontResetCustomerPasswordSuccessTest"/>
 </tests>