#222: Add validation for error message - test fix.

engcom-Foxtrot · engcom-Foxtrot · commit 809e8d90b85b · 2020-08-07T16:20:33.000+03:00
diff --git a/ReCaptchaAdminUi/composer.json b/ReCaptchaAdminUi/composer.json
@@ -5,7 +5,8 @@
         "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-config": "*",
-        "magento/module-re-captcha-ui": "*"
+        "magento/module-re-captcha-ui": "*",
+        "magento/module-store": "*"
     },
     "type": "magento2-module",
     "license": "OSL-3.0",
diff --git a/ReCaptchaAdminUi/etc/config.xml b/ReCaptchaAdminUi/etc/config.xml
@@ -11,8 +11,7 @@
         <recaptcha_backend>
             <failure_messages>
                 <validation_failure_message>reCAPTCHA verification failed.</validation_failure_message>
-                <technical_failure_message>Something went wrong with reCAPTCHA, please contact Store owner.
-                </technical_failure_message>
+                <technical_failure_message>Something went wrong with reCAPTCHA. Please contact the store owner.</technical_failure_message>
             </failure_messages>
         </recaptcha_backend>
     </default>
diff --git a/ReCaptchaContact/Test/Integration/ContactFormTest.php b/ReCaptchaContact/Test/Integration/ContactFormTest.php
@@ -210,7 +210,7 @@ private function checkFailedPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            $this->equalTo(['reCAPTCHA verification failed']),
+            $this->equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
     }
diff --git a/ReCaptchaCustomer/Model/AjaxLogin/ErrorProcessor.php b/ReCaptchaCustomer/Model/AjaxLogin/ErrorProcessor.php
@@ -51,6 +51,7 @@ class ErrorProcessor
     /**
      * @param ActionFlag $actionFlag
      * @param SerializerInterface $serializer
+     * @param LoggerInterface|null $logger
      * @param ErrorMessageConfigInterface|null $errorMessageConfig
      * @param ValidationErrorMessagesProvider|null $validationErrorMessagesProvider
      */
diff --git a/ReCaptchaCustomer/Observer/AjaxLoginObserver.php b/ReCaptchaCustomer/Observer/AjaxLoginObserver.php
@@ -20,7 +20,7 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * AjaxLoginObserver
+ * Observer of ajax login.
  */
 class AjaxLoginObserver implements ObserverInterface
 {
@@ -79,8 +79,7 @@ public function __construct(
     }
 
     /**
-     * @param Observer $observer
-     * @return void
+     * @inheritdoc
      * @throws LocalizedException
      */
     public function execute(Observer $observer): void
diff --git a/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php b/ReCaptchaCustomer/Test/Integration/AjaxLoginFormTest.php
@@ -218,7 +218,12 @@ private function checkFailedPostResponse(array $postValues = []): void
     {
         $this->makePostRequest($postValues);
 
-        $expected = json_encode(['errors' => true, 'message' => 'reCAPTCHA verification failed']);
+        $expected = json_encode(
+            [
+                'errors' => true,
+                'message' => 'Something went wrong with reCAPTCHA. Please contact the store owner.'
+            ]
+        );
 
         $this->assertEquals(
             $expected,
diff --git a/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php b/ReCaptchaCustomer/Test/Integration/CreateCustomerFormTest.php
@@ -238,7 +238,7 @@ private function checkFailedPostResponse(array $postValues = []): void
             // Customer should not be created
         }
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
     }
diff --git a/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php b/ReCaptchaCustomer/Test/Integration/ForgotPasswordFormTest.php
@@ -227,7 +227,7 @@ private function checkFailedPostResponse(array $postValues = []): void
 
         $this->assertRedirect(self::equalTo($this->url->getRouteUrl('customer/account/forgotpassword')));
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
 
diff --git a/ReCaptchaCustomer/Test/Integration/LoginFromTest.php b/ReCaptchaCustomer/Test/Integration/LoginFromTest.php
@@ -227,7 +227,7 @@ private function checkFailedPostResponse(array $postValues = []): void
 
         $this->assertRedirect(self::stringStartsWith($this->url->getRouteUrl('customer/account/login')));
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
 
diff --git a/ReCaptchaFrontendUi/etc/config.xml b/ReCaptchaFrontendUi/etc/config.xml
@@ -11,8 +11,7 @@
         <recaptcha_frontend>
             <failure_messages>
                 <validation_failure_message>reCAPTCHA verification failed.</validation_failure_message>
-                <technical_failure_message>Something went wrong with reCAPTCHA, please contact Store owner.
-                </technical_failure_message>
+                <technical_failure_message>Something went wrong with reCAPTCHA. Please contact the store owner.</technical_failure_message>
             </failure_messages>
         </recaptcha_frontend>
     </default>
diff --git a/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php b/ReCaptchaNewsletter/Test/Integration/NewsletterFormTest.php
@@ -227,7 +227,7 @@ private function checkFailedPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
         self::assertEmpty(
diff --git a/ReCaptchaReview/Test/Integration/ReviewFormTest.php b/ReCaptchaReview/Test/Integration/ReviewFormTest.php
@@ -221,7 +221,7 @@ private function checkFailedPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
         self::assertEquals(0, $this->reviewResourceModel->getTotalReviews(1));
diff --git a/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php b/ReCaptchaSendFriend/Test/Integration/SendFriendFormTest.php
@@ -247,7 +247,7 @@ private function checkFailedPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
         self::assertEmpty($this->transportMock->getSentMessage());
diff --git a/ReCaptchaUi/Model/RequestHandler.php b/ReCaptchaUi/Model/RequestHandler.php
@@ -20,6 +20,8 @@
 
 /**
  * @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RequestHandler implements RequestHandlerInterface
 {
@@ -129,8 +131,12 @@ public function execute(
      * @param string $sourceKey
      * @return void
      */
-    private function processError(HttpResponseInterface $response, array $errorMessages, string $redirectOnFailureUrl, string $sourceKey): void
-    {
+    private function processError(
+        HttpResponseInterface $response,
+        array $errorMessages,
+        string $redirectOnFailureUrl,
+        string $sourceKey
+    ): void {
         $validationErrorText = $this->errorMessageConfig->getValidationFailureMessage();
         $technicalErrorText = $this->errorMessageConfig->getTechnicalFailureMessage();
 
diff --git a/ReCaptchaUser/Observer/LoginObserver.php b/ReCaptchaUser/Observer/LoginObserver.php
@@ -23,7 +23,9 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * LoginObserver
+ * Observer of login.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class LoginObserver implements ObserverInterface
 {
@@ -80,6 +82,8 @@ class LoginObserver implements ObserverInterface
      * @param RequestInterface $request
      * @param LoggerInterface $logger
      * @param string $loginActionName
+     * @param ErrorMessageConfigInterface|null $errorMessageConfig
+     * @param ValidationErrorMessagesProvider|null $validationErrorMessagesProvider
      */
     public function __construct(
         CaptchaResponseResolverInterface $captchaResponseResolver,
@@ -106,8 +110,7 @@ public function __construct(
     }
 
     /**
-     * @param Observer $observer
-     * @return void
+     * @inheritdoc
      * @throws AuthenticationException
      * @throws LocalizedException
      */
diff --git a/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php b/ReCaptchaUser/Test/Integration/ForgotPasswordFormTest.php
@@ -203,7 +203,7 @@ private function checkFailedPostResponse(array $postValues = []): void
         $this->makePostRequest($postValues);
 
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
         self::assertEmpty($this->transportMock->getSentMessage());
diff --git a/ReCaptchaUser/Test/Integration/LoginFormTest.php b/ReCaptchaUser/Test/Integration/LoginFormTest.php
@@ -214,7 +214,7 @@ private function checkFailedPostResponse(array $postValues = []): void
         // Location header is different than in the successful case
         $this->assertRedirect(self::equalTo($this->backendUrl->getUrl('admin')));
         $this->assertSessionMessages(
-            self::equalTo(['reCAPTCHA verification failed']),
+            self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),
             MessageInterface::TYPE_ERROR
         );
         self::assertFalse($this->auth->isLoggedIn());

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@ private function checkFailedPostResponse(array $postValues = []): void`
`210`	`210`	`$this->makePostRequest($postValues);`
`211`	`211`
`212`	`212`	`$this->assertSessionMessages(`
`213`		`- $this->equalTo(['reCAPTCHA verification failed']),`
	`213`	`+ $this->equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),`
`214`	`214`	`MessageInterface::TYPE_ERROR`
`215`	`215`	`);`
`216`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ private function checkFailedPostResponse(array $postValues = []): void`
`238`	`238`	`// Customer should not be created`
`239`	`239`	`}`
`240`	`240`	`$this->assertSessionMessages(`
`241`		`- self::equalTo(['reCAPTCHA verification failed']),`
	`241`	`+ self::equalTo(['Something went wrong with reCAPTCHA. Please contact the store owner.']),`
`242`	`242`	`MessageInterface::TYPE_ERROR`
`243`	`243`	`);`
`244`	`244`	`}`