1 files changed, 11 insertions, 23 deletions

diff --git a/addons/web/static/tests/helpers/test_env.js b/addons/web/static/tests/helpers/test_env.js
index 5b197451517..5a3256e98fd 100644
--- a/addons/web/static/tests/helpers/test_env.js
+++ b/addons/web/static/tests/helpers/test_env.js
@@ -1,10 +1,8 @@
 odoo.define('web.test_env', async function (require) {
     "use strict";
 
-    const AbstractStorageService = require('web.AbstractStorageService');
-    const Bus = require("web.Bus");
-    const RamStorage = require('web.RamStorage');
-    const { buildQuery } = require("web.rpc");
+    const Bus = require('web.Bus');
+    const { buildQuery } = require('web.rpc');
     const session = require('web.session');
 
     /**
@@ -17,9 +15,6 @@ odoo.define('web.test_env', async function (require) {
      * @returns {Proxy}
      */
     function makeTestEnvironment(env = {}, providedRPC = null) {
-        const RamStorageService = AbstractStorageService.extend({
-            storage: new RamStorage(),
-        });
         const database = {
             parameters: {
                 code: "en_US",
@@ -31,33 +26,26 @@ odoo.define('web.test_env', async function (require) {
                 time_format: '%H:%M:%S',
             },
         };
-        let testEnv = {};
         const defaultEnv = {
             _t: env._t || Object.assign((s => s), { database }),
-            bus: new Bus(),
+            bus: env.bus || new Bus(),
             device: Object.assign({ isMobile: false }, env.device),
             isDebug: env.isDebug || (() => false),
             qweb: new owl.QWeb({ templates: session.owlTemplates }),
             services: Object.assign({
-                ajax: { // for legacy subwidgets
+                ajax: {
                     rpc() {
-                        const prom = testEnv.session.rpc(...arguments);
-                        prom.abort = function () {
-                            throw new Error("Can't abort this request");
-                        };
-                        return prom;
-                    },
+                      return env.session.rpc(...arguments); // Compatibility Legacy Widgets
+                    }
                 },
-                getCookie() { },
-                httpRequest() {
+                getCookie() {},
+                httpRequest(/* route, params = {}, readMethod = 'json' */) {
                     return Promise.resolve('');
                 },
                 rpc(params, options) {
                     const query = buildQuery(params);
-                    return testEnv.session.rpc(query.route, query.params, options);
+                    return env.session.rpc(query.route, query.params, options);
                 },
-                local_storage: new RamStorageService(),
-                session_storage: new RamStorageService(),
                 notification: { notify() { } },
             }, env.services),
             session: Object.assign({
@@ -67,10 +55,10 @@ odoo.define('web.test_env', async function (require) {
                     }
                     throw new Error(`No method to perform RPC`);
                 },
+                url: session.url,
             }, env.session),
         };
-        testEnv = Object.assign(env, defaultEnv);
-        return testEnv;
+        return Object.assign(env, defaultEnv);
     }
 
     /**