security-package/issues/105: Cover ReCaptchaContact module with integration test

Author: naydav

ReCaptchaContact/Test/Integration/ContactFormTest.php

@@ -61,6 +61,8 @@ protected function setUp()
      * @magentoConfigFixture base_website customer/captcha/enable 0
      * @magentoConfigFixture base_website recaptcha_frontend/type_invisible/public_key test_public_key
      * @magentoConfigFixture base_website recaptcha_frontend/type_invisible/private_key test_private_key
+     *
+     * @magentoConfigFixture default_store recaptcha_frontend/type_for/contact invisible Needed for ifconfig in layout
      */
     public function testGetRequestIfReCaptchaIsDisabled()
     {
@@ -72,6 +74,8 @@ public function testGetRequestIfReCaptchaIsDisabled()
     /**
      * @magentoConfigFixture base_website customer/captcha/enable 0
      * @magentoConfigFixture base_website recaptcha_frontend/type_for/contact invisible
+     *
+     * @magentoConfigFixture default_store recaptcha_frontend/type_for/contact invisible Needed for ifconfig in layout
      */
     public function testGetRequestIfReCaptchaKeysAreNotConfigured()
     {
@@ -85,6 +89,8 @@ public function testGetRequestIfReCaptchaKeysAreNotConfigured()
      * @magentoConfigFixture base_website recaptcha_frontend/type_invisible/public_key test_public_key
      * @magentoConfigFixture base_website recaptcha_frontend/type_invisible/private_key test_private_key
      * @magentoConfigFixture base_website recaptcha_frontend/type_for/contact invisible
+     *
+     * @magentoConfigFixture default_store recaptcha_frontend/type_for/contact invisible Needed for ifconfig in layout
      */
     public function testGetRequestIfReCaptchaIsEnabled()
     {

ReCaptchaFrontendUi/view/frontend/requirejs-config.js

@@ -5,7 +5,6 @@
 
 'use strict';
 
-// eslint-disable-next-line no-unused-vars
 var config = {
     config: {
         mixins: {

ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php

@@ -8,6 +8,7 @@
 namespace Magento\ReCaptchaUser\Test\Integration;
 
 use Magento\Backend\Model\UrlInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Validation\ValidationResult;
@@ -140,7 +141,7 @@ public function testPostRequestWithSuccessfulReCaptchaValidation()
     public function testPostRequestIfReCaptchaParameterIsMissed()
     {
         $this->getRequest()
-            ->setMethod(HttpRequest::METHOD_POST)
+            ->setMethod(Http::METHOD_POST)
             ->setPostValue(
                 [
                     'form_key' => $this->formKey->getFormKey(),
@@ -163,7 +164,7 @@ public function testPostRequestWithFailedReCaptchaValidation()
         $this->captchaValidationResultMock->expects($this->once())->method('isValid')->willReturn(false);
 
         $this->getRequest()
-            ->setMethod(HttpRequest::METHOD_POST)
+            ->setMethod(Http::METHOD_POST)
             ->setPostValue(
                 [
                     'form_key' => $this->formKey->getFormKey(),
@@ -202,13 +203,15 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false)
      */
     private function checkSuccessfulPostResponse(array $postValues = [])
     {
-        $this->getRequest()->setPostValue(array_replace_recursive(
-            [
-                'form_key' => $this->formKey->getFormKey(),
-                'email' => '[email protected]',
-            ],
-            $postValues
-        ));
+        $this->getRequest()
+            ->setMethod(Http::METHOD_POST)
+            ->setPostValue(array_replace_recursive(
+                [
+                    'form_key' => $this->formKey->getFormKey(),
+                    'email' => '[email protected]',
+                ],
+                $postValues
+            ));
         $this->dispatch('backend/admin/auth/forgotpassword');
 
         $this->assertRedirect(self::equalTo($this->backendUrl->getRouteUrl('adminhtml')));

ReCaptchaUser/Test/Integration/LoginFormTest.php

@@ -9,6 +9,7 @@
 
 use Magento\Backend\Model\Auth;
 use Magento\Backend\Model\UrlInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\Validation\ValidationResult;
@@ -147,7 +148,7 @@ public function testPostRequestWithSuccessfulReCaptchaValidation()
     public function testPostRequestIfReCaptchaParameterIsMissed()
     {
         $this->getRequest()
-            ->setMethod(HttpRequest::METHOD_POST)
+            ->setMethod(Http::METHOD_POST)
             ->setPostValue(
                 [
                     'form_key' => $this->formKey->getFormKey(),
@@ -180,7 +181,7 @@ public function testPostRequestWithFailedReCaptchaValidation()
         $this->captchaValidationResultMock->expects($this->once())->method('isValid')->willReturn(false);
 
         $this->getRequest()
-            ->setMethod(HttpRequest::METHOD_POST)
+            ->setMethod(Http::METHOD_POST)
             ->setPostValue(
                 [
                     'form_key' => $this->formKey->getFormKey(),
@@ -227,7 +228,7 @@ private function checkSuccessfulGetResponse($shouldContainReCaptcha = false): vo
     private function checkSuccessfulPostResponse(array $postValues = []): void
     {
         $this->getRequest()
-            ->setMethod(HttpRequest::METHOD_POST)
+            ->setMethod(Http::METHOD_POST)
             ->setPostValue(array_replace_recursive(
                 [
                     'form_key' => $this->formKey->getFormKey(),