Tests fixed due to dependencies compatibility

Author: biscolab

tests/ReCaptchaCustomApiDomainTest.php

@@ -49,9 +49,9 @@ public function testRecaptchaApiDomainChangesByConfig()
      */
     public function testRecaptchaApiDomainChangesByConfigInHtmlScriptTagJsApi()
     {
-        $this->assertContains("https://www.recaptcha.net/recaptcha/api.js", $this->recaptcha_v2->htmlScriptTagJsApi());
-        $this->assertContains("https://www.recaptcha.net/recaptcha/api.js", $this->recaptcha_invisible->htmlScriptTagJsApi());
-        $this->assertContains("https://www.recaptcha.net/recaptcha/api.js", $this->recaptcha_v3->htmlScriptTagJsApi());
+        $this->assertStringContainsString("https://www.recaptcha.net/recaptcha/api.js", $this->recaptcha_v2->htmlScriptTagJsApi());
+        $this->assertStringContainsString("https://www.recaptcha.net/recaptcha/api.js", $this->recaptcha_invisible->htmlScriptTagJsApi());
+        $this->assertStringContainsString("https://www.recaptcha.net/recaptcha/api.js", $this->recaptcha_v3->htmlScriptTagJsApi());
     }
 
     /**

tests/ReCaptchaHelpersInvisibleTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (c) 2017 - present
  * LaravelGoogleRecaptcha - ReCaptchaHelpersInvisibleTest.phpp
@@ -26,7 +27,6 @@ public function testHtmlScriptTagJsApiCalledByFacade()
             ->with(["form_id" => "test-form"]);
 
         htmlScriptTagJsApi(["form_id" => "test-form"]);
-
     }
 
     /**
@@ -40,7 +40,6 @@ public function testHtmlFormButtonCalledByFacade()
             ->with("Inner text", ['id' => 'button_id']);
 
         htmlFormButton("Inner text", ['id' => 'button_id']);
-
     }
 
     /**
@@ -53,10 +52,10 @@ public function testGetFormIdCalledByFacade()
             ->once();
 
         getFormId();
-
     }
 
-    public function testHtmlFormButtonConfiguration() {
+    public function testHtmlFormButtonConfiguration()
+    {
         $button_html = htmlFormButton("Inner text", ['id' => 'button_id', 'class' => 'button_class', 'data-sitekey' => 'custom-data-sitekey', 'data-callback' => 'myCallback']);
 
         $this->assertEquals('<button class="button_class g-recaptcha" data-callback="biscolabLaravelReCaptcha" data-sitekey="api_site_key" id="button_id">Inner text</button>', $button_html);
@@ -69,11 +68,11 @@ public function testHtmlFormButtonConfiguration() {
     public function testHtmlFormSnippetCalledByFacade()
     {
 
+        $this->expectException('\TypeError');
         ReCaptcha::shouldReceive('htmlFormSnippet')
             ->once();
 
         htmlFormSnippet();
-
     }
 
     public function testGetFormIdReturnDefaultFormIdValue()
@@ -95,4 +94,4 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('recaptcha.api_site_key', 'api_site_key');
         $app['config']->set('recaptcha.version', 'invisible');
     }
-}
+}

tests/ReCaptchaHelpersV2Test.php

@@ -83,7 +83,7 @@ public function testExpectReCaptchaInstanceOfReCaptchaBuilderV2()
      */
     public function testExpectExceptionWhenGetFormIdFunctionIsCalled()
     {
-
+        $this->expectException('\Error');
         getFormId();
     }
 

tests/ReCaptchaTest.php

@@ -94,7 +94,7 @@ public function testReCaptchaV2HtmlFormSnippet()
 	 */
 	public function testReCaptchaInvisibleHtmlFormSnippetShouldThrowError()
 	{
-
+		$this->expectException('\Error');
 		$this->recaptcha_invisible->htmlFormSnippet();
 	}
 
@@ -157,7 +157,7 @@ public function testDefaultCurlTimeout()
 	 */
 	public function testReCaptchaV2htmlFormButtonShouldThrowError()
 	{
-
+		$this->expectException('\Error');
 		$this->recaptcha_v2->htmlFormButton();
 	}
 

tests/ReCaptchaV3Test.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (c) 2017 - present
  * LaravelGoogleRecaptcha - ReCaptchaV3Test.php
@@ -40,7 +41,7 @@ public function testAction()
     {
 
         $r = $this->recaptcha_v3->htmlScriptTagJsApi(['action' => 'someAction']);
-        $this->assertRegexp('/someAction/', $r);
+        $this->assertMatchesRegularExpression('/someAction/', $r);
     }
 
     /**
@@ -50,7 +51,7 @@ public function testFetchCallbackFunction()
     {
 
         $r = $this->recaptcha_v3->htmlScriptTagJsApi(['callback_then' => 'functionCallbackThen']);
-        $this->assertRegexp('/functionCallbackThen\(response\)/', $r);
+        $this->assertMatchesRegularExpression('/functionCallbackThen\(response\)/', $r);
     }
 
     /**
@@ -60,7 +61,7 @@ public function testcCatchCallbackFunction()
     {
 
         $r = $this->recaptcha_v3->htmlScriptTagJsApi(['callback_catch' => 'functionCallbackCatch']);
-        $this->assertRegexp('/functionCallbackCatch\(err\)/', $r);
+        $this->assertMatchesRegularExpression('/functionCallbackCatch\(err\)/', $r);
     }
 
     /**
@@ -70,7 +71,7 @@ public function testCustomValidationFunction()
     {
 
         $r = $this->recaptcha_v3->htmlScriptTagJsApi(['custom_validation' => 'functionCustomValidation']);
-        $this->assertRegexp('/functionCustomValidation\(token\)/', $r);
+        $this->assertMatchesRegularExpression('/functionCustomValidation\(token\)/', $r);
     }
 
     /**
@@ -106,7 +107,6 @@ public function testHtmlScriptTagJsApiCalledByFacade()
             ->with([]);
 
         htmlScriptTagJsApi([]);
-
     }
 
     /**
@@ -132,6 +132,5 @@ protected function setUp(): void
         parent::setUp(); // TODO: Change the autogenerated stub
 
         $this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
-
     }
-}
+}