added more tests

RyanDaDeng · Dec 25, 2018 · 5a89d2e · 5a89d2e
1 parent b0b1dab
commit 5a89d2e
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/src/Core/CurlRequestClient.php b/src/Core/CurlRequestClient.php
@@ -22,10 +22,16 @@ public function post($url, $body, $options = [])
             http_build_query($body));
 
         $response = curl_exec($curl);
+        $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 
         if (false === $response) {
-            return '{"success": false, "error-codes": ["'.GoogleReCaptchaV3Response::ERROR_TIMEOUT.'"]}';
+            return '{"success": false, "error-codes": ["Curl Error Code: ' . GoogleReCaptchaV3Response::ERROR_TIMEOUT . '"]}';
         }
+
+        if ($httpCode !== 200) {
+            return '{"success": false, "error-codes": ["Curl Error Code: ' . $httpCode . '"]}';
+        }
+
         curl_close($curl);
 
         return $response;

diff --git a/src/Core/GuzzleRequestClient.php b/src/Core/GuzzleRequestClient.php
@@ -10,6 +10,7 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\ConnectException;
 use TimeHunter\LaravelGoogleCaptchaV3\Interfaces\RequestClientInterface;
 
 class GuzzleRequestClient implements RequestClientInterface
@@ -24,7 +25,9 @@ public function post($url, $body, $options = [])
 
             return $response->getBody();
         } catch (ClientException $e) {
-            return '{"success": false, "error-codes": ["'.GoogleReCaptchaV3Response::ERROR_TIMEOUT.'"]}';
+            return '{"success": false, "error-codes": ["Guzzle Client Error Code: ' . $e->getCode() . '"]}';
+        } catch (ConnectException $e) {
+            return '{"success": false, "error-codes": ["Guzzle Client Error Code: ' . GoogleReCaptchaV3Response::ERROR_TIMEOUT . '"]}';
         }
     }
 }
diff --git a/src/GoogleReCaptchaV3.php b/src/GoogleReCaptchaV3.php
@@ -53,7 +53,7 @@ public function prepareViewData($mappers)
     public function render($mappers)
     {
         if (! $this->config->isServiceEnabled()) {
-            return;
+            return null;
         }
         $data = $this->prepareViewData($mappers);
 

diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -24,6 +24,21 @@ public function testCurlRequest()
         $this->assertEquals(2, count($response->getErrorCodes()));
     }
 
+    public function testCurlRequest2()
+    {
+        $client = new CurlRequestClient();
+
+        $response = $client->post('https://www.google.com/recaptcha/api/siteve11rify', [
+            'secret' => 'test',
+            'remoteip' => null,
+            'response' => 'test',
+        ]);
+
+        $response = new GoogleReCaptchaV3Response(json_decode($response, 1), null, '');
+        $this->assertEquals(false, $response->isSuccess());
+    }
+
+
     public function testGuzzleRequest()
     {
         $client = new GuzzleRequestClient();
@@ -38,4 +53,19 @@ public function testGuzzleRequest()
         $this->assertEquals(false, $response->toArray()['success']);
         $this->assertEquals(2, count($response->getErrorCodes()));
     }
+
+
+    public function testGuzzleRequest2()
+    {
+        $client = new GuzzleRequestClient();
+
+        $response = $client->post('https://www.google.com/recaptcha/api/sitev111erify', [
+            'secret' => 'test',
+            'remoteip' => null,
+            'response' => 'test',
+        ]);
+
+        $response = new GoogleReCaptchaV3Response(json_decode($response, 1), null, '');
+        $this->assertEquals(false, $response->toArray()['success']);
+    }
 }