Minor fixes to magento-commerce/magento-functional-tests-migration#682

Author: okolesnyk

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontResetCustomerPasswordFailedTest">
+        <before>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set {{StorefrontCustomerCaptchaEnableConfigData.path}} {{StorefrontCustomerCaptchaEnableConfigData.value}}" stepKey="enableCaptcha"/>
+        </after>
+    </test>
+</tests>

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertCustomerResetPasswordActionGroup">
+        <arguments>
+            <argument name="url" type="string"/>
+            <argument name="message" type="string" defaultValue="" />
+            <argument name="messageType" type="string" defaultValue="success" />
+        </arguments>
+
+        <waitForElementVisible selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}" stepKey="waitForMessage" />
+        <see stepKey="seeMessage" userInput="{{message}}" selector="{{StorefrontCustomerLoginMessagesSection.messageByType(messageType)}}"/>
+        <seeInCurrentUrl stepKey="seeCorrectCurrentUrl" url="{{url}}"/>
+    </actionGroup>
+</actionGroups>

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

@@ -21,16 +21,4 @@
         <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>
 </actionGroups>

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

@@ -13,16 +13,16 @@
             <features value="Customer"/>
             <title value="Customer tries to reset password several times"/>
             <description value="Customer tries to reset password several times"/>
+            <severity value="CRITICAL" />
+            <testCaseId value="MC-14374" />
             <group value="Customer"/>
             <group value="security"/>
             <group value="mtf_migrated"/>
         </annotations>
         <before>
-            <magentoCLI command="config:set customer/captcha/enable 0" stepKey="disableCaptcha"/>
             <createData stepKey="customer" entity="Simple_US_Customer"/>
         </before>
         <after>
-            <magentoCLI command="config:set customer/captcha/enable 1" stepKey="enableCaptcha"/>
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 

dev/tests/functional/tests/app/Magento/Security/Test/TestCase/ResetCustomerPasswordFailedTest.xml

@@ -8,8 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Security\Test\TestCase\ResetCustomerPasswordFailedTest" summary="Reset customer password.">
         <variation name="ResetPasswordTestVariation">
-            <data name="tag" xsi:type="string">mftf_migrated:yes</data>
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1,mftf_migrated:yes</data>
             <data name="customer/dataset" xsi:type="string">customer_US</data>
             <data name="attempts" xsi:type="string">2</data>
             <data name="configData" xsi:type="string">captcha_storefront_disable</data>