MAGETWO-66310: [FT] Magento\Captcha\Test\TestCase\CaptchaOnAdminLoginTest is failing

Author: rliukshyn

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

@@ -6,6 +6,7 @@
 
 namespace Magento\Captcha\Test\TestCase;
 
+use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Mtf\TestStep\TestStepFactory;
 use Magento\User\Test\Fixture\User;
@@ -29,20 +30,6 @@
  */
 class CaptchaOnAdminLoginTest extends Injectable
 {
-    /**
-     * Step factory.
-     *
-     * @var TestStepFactory
-     */
-    private $stepFactory;
-
-    /**
-     * Assert Captcha.
-     *
-     * @var AssertCaptchaFieldOnBackend
-     */
-    private $assertCaptcha;
-
     /**
      * Admin login page.
      *
@@ -57,58 +44,47 @@ class CaptchaOnAdminLoginTest extends Injectable
      */
     private $systemConfigEditPage;
 
-    /**
-     * Configuration setting.
-     *
-     * @var string
-     */
-    private $configData;
-
     /**
      * Injection data.
      *
-     * @param AdminAuthLoginWithCaptcha $adminAuthWithCaptcha
-     * @param TestStepFactory $stepFactory
-     * @param AssertCaptchaFieldOnBackend $assertCaptcha
      * @param SystemConfigEdit $systemConfigEditPage
      * @return void
      */
-    public function __inject(
-        AdminAuthLoginWithCaptcha $adminAuthWithCaptcha,
-        TestStepFactory $stepFactory,
-        AssertCaptchaFieldOnBackend $assertCaptcha,
-        SystemConfigEdit $systemConfigEditPage
-    ) {
-        $this->stepFactory = $stepFactory;
-        $this->adminAuthWithCaptcha = $adminAuthWithCaptcha;
-        $this->assertCaptcha = $assertCaptcha;
+    public function __inject(SystemConfigEdit $systemConfigEditPage)
+    {
         $this->systemConfigEditPage = $systemConfigEditPage;
     }
 
     /**
-     * Login user on backend.
+     * Log in user to Admin.
      *
+     * @param AdminAuthLoginWithCaptcha $adminAuthWithCaptcha
+     * @param TestStepFactory $stepFactory
+     * @param AssertCaptchaFieldOnBackend $assertCaptcha
      * @param User $customAdmin
+     * @param AdminAuthLogin $adminAuthLogin
      * @param string $configData
      * @return void
      */
     public function test(
+        AdminAuthLoginWithCaptcha $adminAuthWithCaptcha,
+        TestStepFactory $stepFactory,
+        AssertCaptchaFieldOnBackend $assertCaptcha,
         User $customAdmin,
+        AdminAuthLogin $adminAuthLogin,
         $configData
     ) {
-        $this->configData = $configData;
         $customAdmin->persist();
 
         // Preconditions
-        $this->stepFactory->create(
+        $stepFactory->create(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
-            ['configData' => $this->configData]
+            ['configData' => $configData]
         )->run();
-
-        $this->adminAuthWithCaptcha->open();
-        $this->adminAuthWithCaptcha->getLoginBlockWithCaptcha()->fill($customAdmin);
-        $this->assertCaptcha->processAssert($this->adminAuthWithCaptcha);
-        $this->adminAuthWithCaptcha->getLoginBlockWithCaptcha()->submit();
+        $adminAuthLogin->open();
+        $adminAuthWithCaptcha->getLoginBlockWithCaptcha()->fill($customAdmin);
+        $assertCaptcha->processAssert($adminAuthWithCaptcha);
+        $adminAuthWithCaptcha->getLoginBlockWithCaptcha()->submit();
     }
 
     /**

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

@@ -12,7 +12,7 @@
             <data name="customAdmin/data/captcha" xsi:type="string">111</data>
             <data name="pageTitle" xsi:type="string">Dashboard</data>
             <data name="configData" xsi:type="string">captcha_backend_login</data>
-            <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable"/>
+            <constraint name="Magento\Backend\Test\Constraint\AssertBackendPageIsAvailable" />
         </variation>
     </testCase>
 </config>