MTO-144: [Test] Captcha and lockout for Storefront login page

- Defects fixed

Author: AndreiZiblitski

dev/tests/functional/tests/app/Magento/Captcha/Test/Fixture/Customer.xml

@@ -8,6 +8,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/fixture.xsd">
     <fixture name="customer">
         <field name="captcha" is_required="0" />
-        <field name="comment" is_required="0" />
     </fixture>
 </config>

dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaAndLockoutCustomerTest.php

@@ -7,6 +7,7 @@
 namespace Magento\Captcha\Test\TestCase;
 
 use Magento\Customer\Test\Block\Form\Login;
+use Magento\Mtf\Fixture\FixtureInterface;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Mtf\TestStep\TestStepFactory;
 use Magento\Customer\Test\Fixture\Customer;
@@ -54,7 +55,7 @@ class CaptchaAndLockoutCustomerTest extends Injectable
     private $customerAccountLogin;
 
     /**
-     * Customer Edit page
+     * CustomerIndexEdit page.
      *
      * @var CustomerIndexEdit
      */
@@ -119,51 +120,58 @@ public function test(
         $correctData['group_id'] = [
             'customerGroup' => $customer->getDataFieldConfig('group_id')['source']->getCustomerGroup()
         ];
-        $incorrectData = $correctData;
-        $incorrectData['password'] = $incorrectPassword;
 
-        $customer = $this->fixtureFactory->createByCode('customer', ['data' => $incorrectData]);
+        $newData = $customer->getData();
+        $newData['captcha'] = $captcha;
+        $newData['group_id'] = [
+            'customerGroup' => $customer->getDataFieldConfig('group_id')['source']->getCustomerGroup()
+        ];
+        $newData['password'] = $incorrectPassword;
+
+        $incorrectCustomer = $this->fixtureFactory->createByCode('customer', ['data' => $newData]);
 
         // Steps
         $this->customerAccountLogin->open();
 
-        // Fill incorrect password 3 or more times.
-        $this->customerLogin($customer, $this->customerAccountLogin->getLoginBlock(), $attempts);
+        // Fill incorrect password $attempts times.
+        $this->customerLogin($incorrectCustomer,
+            $this->customerAccountLogin->getLoginBlock(), $attempts);
 
-        // Fill correct captcha and incorrect password 3 or more times.
-        $this->customerLogin($customer, $this->customerAccountLogin->getLoginBlockWithCaptcha(), $attempts);
+        // Fill correct captcha and incorrect password $attempts times.
+        $this->customerLogin($incorrectCustomer,
+            $this->customerAccountLogin->getLoginBlockWithCaptcha(), $attempts);
 
         // Log in customer with correct captcha and correct password.
         $customer = $this->fixtureFactory->createByCode('customer', ['data' => $correctData]);
         $this->customerLogin($customer, $this->customerAccountLogin->getLoginBlockWithCaptcha(), 1);
     }
 
-    /**
-     * Set default configuration.
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        $this->stepFactory->create(
-            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
-            ['configData' => $this->configData, 'rollback' => true]
-        )->run();
-    }
-
     /**
      * Log in customer $attempts times.
      *
-     * @param Customer $customer
+     * @param FixtureInterface $customer
      * @param Login $loginForm
      * @param int $attempts
      * @return void
      */
-    private function customerLogin(Customer $customer, Login $loginForm, $attempts)
+    private function customerLogin(FixtureInterface $customer, Login $loginForm, $attempts)
     {
         for ($i = 0; $i < $attempts; $i++) {
             $loginForm->fill($customer);
             $loginForm->submit();
         }
     }
+
+    /**
+     * Set default configuration.
+     *
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->stepFactory->create(
+            \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
+            ['configData' => $this->configData, 'rollback' => true]
+        )->run();
+    }
 }

dev/tests/functional/tests/app/Magento/Captcha/Test/TestCase/CaptchaAndLockoutCustomerTest.xml

@@ -13,7 +13,7 @@
             <data name="attempts" xsi:type="number">3</data>
             <data name="captcha" xsi:type="string">111</data>
             <data name="configData" xsi:type="string">captcha_storefront_login_failures_number, customer_max_login_failures_number</data>
-            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerIsLockedOnBackend"/>
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerIsLockedOnBackend" />
         </variation>
     </testCase>
 </config>

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php

@@ -173,7 +173,7 @@ public function getJsErrors()
 
 
     /**
-     * Return personal information.
+     * Get personal information.
      *
      * @param string $title
      * @return string

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerIsLockedOnBackend.php

@@ -8,11 +8,10 @@
 
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit;
-use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertCustomerIsLocked
+ * Assert that customer account is locked on backend.
  */
 class AssertCustomerIsLockedOnBackend extends AbstractConstraint
 {
@@ -25,17 +24,14 @@ class AssertCustomerIsLockedOnBackend extends AbstractConstraint
      * Assert customer account status on the backend.
      *
      * @param CustomerIndexEdit $customerIndexEdit
-     * @param CustomerIndex $customerIndex
      * @param Customer $customer
      * @return void
      */
     public function processAssert(
         CustomerIndexEdit $customerIndexEdit,
-        CustomerIndex $customerIndex,
         Customer $customer
     ) {
-        $customerIndex->open();
-        $customerIndex->getCustomerGridBlock()->searchAndOpen(['email' => $customer->getEmail()]);
+        $customerIndexEdit->open(['id' => $customer->getId()]);
         \PHPUnit_Framework_Assert::assertEquals(
             self::CUSTOMER_LOCKED_ACCOUNT,
             $customerIndexEdit->getCustomerForm()->getPersonalInformation('Account Lock'),
@@ -44,7 +40,7 @@ public function processAssert(
     }
 
     /**
-     * Assert that displayed error message is correct.
+     * Assert that displayed customer account status is correct.
      *
      * @return string
      */