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

Author: Dell-

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

@@ -6,12 +6,13 @@
 
 namespace Magento\Captcha\Test\TestCase;
 
-use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
-use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnBackend;
-use Magento\Captcha\Test\Page\Captcha\AdminAuthLoginWithCaptcha;
+use Magento\Backend\Test\Page\AdminAuthLogin;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Mtf\TestStep\TestStepFactory;
 use Magento\User\Test\Fixture\User;
+use Magento\Captcha\Test\Constraint\AssertCaptchaFieldOnBackend;
+use Magento\Captcha\Test\Page\Captcha\AdminAuthLoginWithCaptcha;
+use Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit;
 
 /**
  * Check CAPTCHA on Admin Login Page.
@@ -30,82 +31,81 @@
 class CaptchaOnAdminLoginTest extends Injectable
 {
     /**
-     * Step factory.
+     * Admin login page with Captcha.
      *
-     * @var TestStepFactory
+     * @var AdminAuthLoginWithCaptcha
      */
-    private $stepFactory;
+    private $adminAuthWithCaptcha;
 
     /**
-     * Assert Captcha.
+     * System configuration page.
      *
-     * @var AssertCaptchaFieldOnBackend
+     * @var SystemConfigEdit
      */
-    private $assertCaptcha;
+    private $systemConfigEditPage;
 
     /**
-     * Admin login page.
+     * Login page for Admin.
      *
-     * @var AdminAuthLoginWithCaptcha
+     * @var AdminAuthLogin
      */
-    protected $adminAuthWithCaptcha;
+    private $adminAuthLogin;
 
     /**
-     * System configuration page.
+     * Factory for Test Steps.
      *
-     * @var SystemConfigEdit
+     * @var TestStepFactory
      */
-    private $systemConfigEditPage;
+    private $stepFactory;
 
     /**
-     * Configuration setting.
+     * Assert captcha on backend login page.
      *
-     * @var string
+     * @var AssertCaptchaFieldOnBackend
      */
-    private $configData;
+    private $assertCaptcha;
 
     /**
      * Injection data.
      *
+     * @param SystemConfigEdit $systemConfigEditPage
      * @param AdminAuthLoginWithCaptcha $adminAuthWithCaptcha
      * @param TestStepFactory $stepFactory
+     * @param AdminAuthLogin $adminAuthLogin
      * @param AssertCaptchaFieldOnBackend $assertCaptcha
-     * @param SystemConfigEdit $systemConfigEditPage
      * @return void
      */
     public function __inject(
+        SystemConfigEdit $systemConfigEditPage,
         AdminAuthLoginWithCaptcha $adminAuthWithCaptcha,
         TestStepFactory $stepFactory,
-        AssertCaptchaFieldOnBackend $assertCaptcha,
-        SystemConfigEdit $systemConfigEditPage
+        AdminAuthLogin $adminAuthLogin,
+        AssertCaptchaFieldOnBackend $assertCaptcha
     ) {
-        $this->stepFactory = $stepFactory;
+        $this->systemConfigEditPage = $systemConfigEditPage;
         $this->adminAuthWithCaptcha = $adminAuthWithCaptcha;
+        $this->stepFactory = $stepFactory;
+        $this->adminAuthLogin = $adminAuthLogin;
         $this->assertCaptcha = $assertCaptcha;
-        $this->systemConfigEditPage = $systemConfigEditPage;
     }
 
     /**
-     * Login user on backend.
+     * Log in user to Admin.
      *
      * @param User $customAdmin
      * @param string $configData
      * @return void
      */
-    public function test(
-        User $customAdmin,
-        $configData
-    ) {
-        $this->configData = $configData;
+    public function test(User $customAdmin, $configData)
+    {
         $customAdmin->persist();
 
         // Preconditions
         $this->stepFactory->create(
             \Magento\Config\Test\TestStep\SetupConfigurationStep::class,
-            ['configData' => $this->configData]
+            ['configData' => $configData]
         )->run();
-
-        $this->adminAuthWithCaptcha->open();
+        $this->adminAuthLogin->open();
         $this->adminAuthWithCaptcha->getLoginBlockWithCaptcha()->fill($customAdmin);
         $this->assertCaptcha->processAssert($this->adminAuthWithCaptcha);
         $this->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>