[IMP] Add new tests

website_recaptcha_v2_form/controllers/form.py

@@ -1,20 +1,30 @@
-# -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 import json
+
 from odoo import http
+
 from odoo.addons.website.controllers.form import WebsiteForm
-from odoo.addons.website_recaptcha_v2_form.controllers.main import BinhexHome
+
+from .main import BinhexHome
 
 
 class WebsiteRecaptchaForm(WebsiteForm):
-    @http.route('/website/form/<string:model_name>', type='http', auth="public", methods=['POST'], website=True,
-                csrf=False)
+    @http.route(
+        "/website/form/<string:model_name>",
+        type="http",
+        auth="public",
+        methods=["POST"],
+        website=True,
+        csrf=False,
+    )
     def website_form(self, model_name, **kwargs):
-        if kwargs.get('recaptcha_enabled', False):
+        if kwargs.get("recaptcha_enabled", False):
             valid = BinhexHome.verify_recaptcha_v2(self, values=kwargs)
             if not isinstance(valid, bool):
-                return json.dumps({
-                    'error': valid,
-                })
+                return json.dumps(
+                    {
+                        "error": valid,
+                    }
+                )
         return super().website_form(model_name, **kwargs)

website_recaptcha_v2_form/controllers/main.py

@@ -27,12 +27,12 @@ def verify_recaptcha_v2(self, args=None, kw=None, template="", values=None):
             message_error = str(
                 e.args[0] if len(e.args) > 0 else _("Recaptcha is not valid.")
             )
-            if template in ('web.login', 'auth_signup.reset_password', 'auth_signup.signup'):
-                values.update(
-                    {
-                        "error": message_error
-                    }
-                )
+            if template in (
+                "web.login",
+                "auth_signup.reset_password",
+                "auth_signup.signup",
+            ):
+                values.update({"error": message_error})
                 response = request.render(template, values)
                 response.headers["X-Frame-Options"] = "SAMEORIGIN"
                 response.headers["Content-Security-Policy"] = "frame-ancestors 'self'"
@@ -50,8 +50,8 @@ def web_login(self, redirect=None, **kw):
             # that the recaptcha is not checked again to avoid errors.
 
             if (
-                    values.get("confirm_password", "") == ""
-                    and request.httprequest.url.find("web/signup") == -1
+                values.get("confirm_password", "") == ""
+                and request.httprequest.url.find("web/signup") == -1
             ):
                 return self.verify_recaptcha_v2(
                     kw=kw, template="web.login", values=values

website_recaptcha_v2_form/static/src/snippets/s_website_form/000.js

@@ -108,13 +108,13 @@ odoo.define("website_recaptcha_v2_form.s_website_form", function (require) {
                         this.$target.data("model_name")),
                 form_values
             )
-                .then(async function (result_data) {
+                .then(async function (data) {
                     // Restore send button behavior
                     self.$target
                         .find(".s_website_form_send, .o_website_form_send")
                         .removeAttr("disabled")
                         .removeClass("disabled");
-                    result_data = JSON.parse(result_data);
+                    var result_data = JSON.parse(data);
                     if (!result_data.id) {
                         // Failure, the server didn't return the created record ID
                         self.update_status(

website_recaptcha_v2_form/static/src/snippets/s_website_form/options.js

@@ -38,7 +38,7 @@ odoo.define("website_recaptcha_v2_form.form_editor", function (require) {
                         ) || ""
                     );
             }
-            return this._super(...arguments);
+            return this._super(methodName, params);
         },
     });
 });

website_recaptcha_v2_form/static/src/xml/website_form_editor.xml

@@ -11,10 +11,13 @@
                     window.reload();
                 }
             </script>
-            <script src="https://www.recaptcha.net/recaptcha/api.js" async="1"/>
-            <div class="g-recaptcha" t-att-data-sitekey="recaptcha_site_key"
-                 data-callback="callback_success_recaptcha"
-                 data-expired-callback="callback_expired_recaptcha"/>
+            <script src="https://www.recaptcha.net/recaptcha/api.js" async="1" />
+            <div
+                class="g-recaptcha"
+                t-att-data-sitekey="recaptcha_site_key"
+                data-callback="callback_success_recaptcha"
+                data-expired-callback="callback_expired_recaptcha"
+            />
         </div>
     </t>
 

website_recaptcha_v2_form/tests/__init__.py

@@ -1 +1,2 @@
 from . import test_recaptcha
+from . import test_controller_form

website_recaptcha_v2_form/tests/test_controller_form.py

@@ -0,0 +1,28 @@
+import json
+
+from odoo.tests.common import HttpCase
+
+imp_requests = "odoo.addons.website_recaptcha_v2.models.website.requests"
+
+
+class TestControllerForm(HttpCase):
+    def open_url_form(self, data=None, url="/website/form/res.partner"):
+        if not data:
+            data = {
+                "recaptcha_enabled": True,
+                "g-recaptcha": "",
+            }
+        res = self.url_open(
+            url=url,
+            data=data,
+        )
+        return res
+
+    def test_recaptcha_enabled_form(self):
+        res = self.open_url_form()
+        recaptcha_not_response = json.loads(res.content.decode("utf-8"))
+        self.assertEqual(
+            recaptcha_not_response.get("error"),
+            "No response given.",
+            msg=recaptcha_not_response.get("error"),
+        )

website_recaptcha_v2_form/tests/test_recaptcha.py

@@ -32,3 +32,23 @@ def test_captcha_not_valid(self, requests_mock):
         requests_mock.post().json.return_value = {"success": False}
         with self.assertRaises(AccessDenied):
             self.website.valid_recaptcha({"g-recaptcha-response": ""})
+
+    def test_valid_recaptcha_v2_site_key(self):
+        recaptcha_v2_site_key = self.website.recaptcha_v2_site_key
+        self.assertEqual(recaptcha_v2_site_key, "test-site")
+        recaptcha_v2_site_key = ""
+        self.assertNotEqual(
+            recaptcha_v2_site_key,
+            "test-site",
+            msg="The website key for recaptcha is empty.",
+        )
+
+    def test_valid_recaptcha_v2_recaptcha_v2_secret_key(self):
+        recaptcha_v2_secret_key = self.website.recaptcha_v2_secret_key
+        self.assertEqual(recaptcha_v2_secret_key, "test-secret")
+        recaptcha_v2_secret_key = ""
+        self.assertNotEqual(
+            recaptcha_v2_secret_key,
+            "test-site",
+            msg="The website key for recaptcha is empty.",
+        )