fixed cleancode

Author: RyanDaDeng

resources/views/googlerecaptchav3/background.blade.php

@@ -1,18 +1,17 @@
-@if(\TimeHunter\LaravelGoogleReCaptchaV3\GoogleReCaptchaV3::$hasAction === false)
-    @if($display === false)
-        <style>
-            .grecaptcha-badge {
-                display: none;
-            }
-        </style>
-    @endif
-    <script>
-        if (!document.getElementById('gReCaptchaScript')) {
-            let reCaptchaScript = document.createElement('script');
-            reCaptchaScript.setAttribute('src', 'https://www.google.com/recaptcha/api.js?render={{$publicKey}}');
-            reCaptchaScript.async = true;
-            reCaptchaScript.defer = true;
-            document.head.appendChild(reCaptchaScript);
+@if($display === false)
+    <style>
+        .grecaptcha-badge {
+            display: none;
         }
-    </script>
+    </style>
 @endif
+<script>
+    if (!document.getElementById('gReCaptchaScript')) {
+        let reCaptchaScript = document.createElement('script');
+        reCaptchaScript.setAttribute('src', 'https://www.google.com/recaptcha/api.js?render={{$publicKey}}');
+        reCaptchaScript.async = true;
+        reCaptchaScript.defer = true;
+        document.head.appendChild(reCaptchaScript);
+    }
+</script>
+

resources/views/googlerecaptchav3/template.blade.php

@@ -1,4 +1,3 @@
-{{\TimeHunter\LaravelGoogleReCaptchaV3\GoogleReCaptchaV3::setHasAction(true)}}
 <script>
 
     function onloadCallback() {

src/GoogleReCaptchaV3.php

@@ -17,30 +17,20 @@ class GoogleReCaptchaV3
     private $service;
     private $defaultTemplate = 'GoogleReCaptchaV3::googlerecaptchav3.template';
     private $defaultBackgroundTemplate = 'GoogleReCaptchaV3::googlerecaptchav3.background';
-
     public static $hasAction = false;
 
     public function __construct(GoogleReCaptchaV3Service $service)
     {
         $this->service = $service;
     }
 
-    /**
-     * @param $value
-     * @return bool
-     */
-    public static function setHasAction($value)
-    {
-        self::$hasAction = $value;
-        return self::$hasAction;
-    }
-
     /**
      * @param $mappers
      * @return array
      */
     public function prepareViewData($mappers)
     {
+        self::$hasAction = true;
         $prepareData = [];
         foreach ($mappers as $id => $action) {
             $prepareData[$action][] = $id;
@@ -72,6 +62,10 @@ public function prepareBackgroundData()
      */
     public function background()
     {
+        if(self::$hasAction){
+            return;
+        }
+
         return app('view')
             ->make(
                 $this->getBackgroundView(),

tests/ViewTest.php

@@ -57,4 +57,34 @@ public function testView2()
         $this->assertEquals(false, $data['inline']);
         $this->assertEquals('en', $data['language']);
     }
+
+
+    public function testView3()
+    {
+        // Create a stub for the SomeClass class.
+        $configStub = $this->createMock(ReCaptchaConfigV3::class);
+
+        // Configure the stub.
+        $configStub->method('isServiceEnabled')
+            ->willReturn(true);
+
+        $configStub->method('getSiteKey')
+            ->willReturn('test1');
+
+        $configStub->method('isInline')
+            ->willReturn(false);
+
+        $configStub->method('getLanguage')
+            ->willReturn('en');
+
+        $clientStub = $this->createMock(GuzzleRequestClient::class);
+
+        $_service = new GoogleReCaptchaV3Service($configStub, $clientStub);
+        $service = new GoogleReCaptchaV3($_service);
+
+        $service->prepareViewData(['contact_us_id' => 'contact_us']);
+        $background = $service->background();
+        $this->assertEquals('', $background);
+
+    }
 }