[FIX] web: tests - allow custom responses in onRpc

Before this commit, when an 'onRpc' handler would return a 'Response'
object, it would still be wrapped in a JSON-RPC payload (under the
'result' key) if the "content-type" header specified that it was a
JSON-RPC.

However, if a 'Response' object is returned by the handler, it usually
means that the response should be that object as-is, as it was created
with the desired final parameters.

This commit ensures that 'Response' values are returned as they are,
instead of being wrapped in a JSON-RPC payload object.

Since this is also in the scope of mock server responses, this commit
removes the use of '{ pure: true }' RPC handlers that are not necessary.

closes odoo#233199

X-original-commit: a2cab03
Signed-off-by: Aaron Bohy (aab) <aab@odoo.com>
Signed-off-by: Julien Mougenot (jum) <jum@odoo.com>

Author: jum-odoo

addons/calendar/static/tests/calendar.test.js

@@ -56,11 +56,7 @@ test("Many2ManyAttendee: basic rendering", async () => {
 });
 
 test("[Offline] Many2ManyAttendee: basic rendering", async () => {
-    onRpc(
-        "/web/dataset/call_kw/res.partner/get_attendee_detail",
-        () => new Response("", { status: 502 }),
-        { pure: true }
-    );
+    onRpc("res.partner", "get_attendee_detail", () => new Response("", { status: 502 }));
     await mountView({
         type: "form",
         resModel: "calendar.event",

addons/web/static/tests/_framework/mock_server/mock_server.js

@@ -541,9 +541,7 @@ export class MockServer {
         // Set default routes
         this._onRoute(["/web/action/load"], this.loadAction);
         this._onRoute(["/web/action/load_breadcrumbs"], this.loadActionBreadcrumbs);
-        this._onRoute(["/web/bundle/<string:bundle_name>"], this.loadBundle, {
-            pure: true,
-        });
+        this._onRoute(["/web/bundle/<string:bundle_name>"], this.loadBundle);
         this._onRoute(["/web/dataset/call_kw", "/web/dataset/call_kw/<path:path>"], this.callKw, {
             final: true,
         });
@@ -553,15 +551,9 @@ export class MockServer {
             { final: true }
         );
         this._onRoute(["/web/dataset/resequence"], this.resequence);
-        this._onRoute(["/web/image/<string:model>/<int:id>/<string:field>"], this.loadImage, {
-            pure: true,
-        });
-        this._onRoute(["/web/webclient/load_menus"], this.loadMenus, {
-            pure: true,
-        });
-        this._onRoute(["/web/webclient/translations"], this.loadTranslations, {
-            pure: true,
-        });
+        this._onRoute(["/web/image/<string:model>/<int:id>/<string:field>"], this.loadImage);
+        this._onRoute(["/web/webclient/load_menus"], this.loadMenus);
+        this._onRoute(["/web/webclient/translations"], this.loadTranslations);
 
         // Register ambiant parameters
         await this.configure(getCurrentParams());
@@ -794,7 +786,7 @@ export class MockServer {
                     error = err instanceof Error ? err : new Error(err);
                 }
                 if (final || error || (result !== null && result !== undefined)) {
-                    if (pure) {
+                    if (pure || result instanceof Response) {
                         jsonRpcParams = null;
                     }
                     break;

addons/web/static/tests/mock_server/mock_server.test.js

@@ -153,15 +153,15 @@ defineModels([Partner, Bar, Foo]);
  *  kwargs: Record<string, any>;
  *  [key: string]: any;
  * }} params
- * @returns
  */
-const ormRequest = async (params) => {
-    const response = await fetch(`/web/dataset/call_kw/${params.model}/${params.method}`, {
+function fetchCallKw(params) {
+    return fetch(`/web/dataset/call_kw/${params.model}/${params.method}`, {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
         },
         body: JSON.stringify({
+            id: nextJsonRpcId++,
             jsonrpc: "2.0",
             method: "call",
             params: {
@@ -171,6 +171,19 @@ const ormRequest = async (params) => {
             },
         }),
     });
+}
+
+/**
+ * @param {{
+ *  model: string;
+ *  method: string;
+ *  args: any[];
+ *  kwargs: Record<string, any>;
+ *  [key: string]: any;
+ * }} params
+ */
+const ormRequest = async (params) => {
+    const response = await fetchCallKw(params);
     const { error, result } = await response.json();
     if (error) {
         console.error(error);
@@ -188,6 +201,7 @@ const JSON_RPC_BASIC_PARAMS = {
         ["Content-Type"]: "application/json",
     },
 };
+let nextJsonRpcId = 0;
 
 describe.current.tags("headless");
 
@@ -320,6 +334,13 @@ test("rpc: calls on mock server", async () => {
     );
 });
 
+test("performRPC: custom response", async () => {
+    const customResponse = new Response("{}", { status: 418 });
+    onRpc(() => customResponse);
+    await makeMockServer();
+    await expect(fetchCallKw({})).resolves.toBe(customResponse);
+});
+
 test("performRPC: search with active_test=false", async () => {
     await makeMockServer();
     const result = await ormRequest({

addons/web/static/tests/views/fields/badge_selection_field.test.js

@@ -75,9 +75,7 @@ test("BadgeSelectionField widget on a many2one in a new record", async () => {
 });
 
 test("[Offline] BadgeSelectionField widget on a many2one", async () => {
-    onRpc("/web/dataset/call_kw/product/name_search", () => new Response("", { status: 502 }), {
-        pure: true,
-    });
+    onRpc("product", "name_search", () => new Response("", { status: 502 }));
     await mountView({
         resModel: "res.partner",
         resId: 2,

addons/web/static/tests/views/fields/many2many_checkboxes_field.test.js

@@ -76,13 +76,7 @@ test("Many2ManyCheckBoxesField", async () => {
 });
 
 test("[Offline] Many2ManyCheckBoxesField", async () => {
-    onRpc(
-        "/web/dataset/call_kw/partner.type/name_search",
-        () => new Response("", { status: 502 }),
-        {
-            pure: true,
-        }
-    );
+    onRpc("partner.type", "name_search", () => new Response("", { status: 502 }));
     Partner._records[0].timmy = [12];
     await mountView({
         type: "form",

addons/web/static/tests/views/fields/radio_field.test.js

@@ -71,9 +71,7 @@ test("radio field on a many2one in a new record", async () => {
 
 test("[Offline] radio field on a many2one", async () => {
     Partner._records[0].product_id = 37;
-    onRpc("/web/dataset/call_kw/product/web_search_read", () => new Response("", { status: 502 }), {
-        pure: true,
-    });
+    onRpc("product", "web_search_read", () => new Response("", { status: 502 }));
     await mountView({
         type: "form",
         resModel: "partner",

addons/web/static/tests/views/fields/selection_field.test.js

@@ -114,9 +114,7 @@ test("SelectionField, edition and on many2one field", async () => {
 
 test.tags("desktop");
 test("[Offline] SelectionField on many2one field", async () => {
-    onRpc("/web/dataset/call_kw/product/name_search", () => new Response("", { status: 502 }), {
-        pure: true,
-    });
+    onRpc("product", "name_search", () => new Response("", { status: 502 }));
     Partner._onChanges.product_id = () => {};
     Partner._records[0].product_id = 37;
     Partner._records[0].trululu = false;

addons/web/static/tests/views/fields/statusbar_field.test.js

@@ -137,9 +137,7 @@ test("[Offline] static statusbar widget on many2one field", async () => {
         domain: "[('bar', '=', True)]",
     });
     Partner._records[1].bar = false;
-    onRpc("/web/dataset/call_kw/partner/search_read", () => new Response("", { status: 502 }), {
-        pure: true,
-    });
+    onRpc("partner", "search_read", () => new Response("", { status: 502 }));
 
     await mountView({
         type: "form",