[REF] web, mail, im_livechat: tests: remove afterNextRender

Part-of: odoo/odoo#134025

addons/im_livechat/__manifest__.py

@@ -132,7 +132,7 @@ Help your customers with this chat, and analyse their feedback.
             'im_livechat/static/src/embed/external/**/*',
         ],
         'im_livechat.embed_test_assets': [
-            ('include', 'web.assets_backend_tests'),
+            ('include', 'web.assets_backend'),
             ('include', 'web.tests_assets'),
             ('remove', 'web/static/tests/mock_server_tests.js'),
             ('remove', 'im_livechat/static/**'),

addons/mail/static/tests/helpers/test_utils.js

@@ -9,7 +9,7 @@ import { patchBrowserNotification } from "@mail/../tests/helpers/patch_notificat
 import { getAdvanceTime } from "@mail/../tests/helpers/time_control";
 import { getWebClientReady } from "@mail/../tests/helpers/webclient_setup";
 
-import { App, EventBus } from "@odoo/owl";
+import { EventBus } from "@odoo/owl";
 
 import { browser } from "@web/core/browser/browser";
 import { registry } from "@web/core/registry";
@@ -23,8 +23,6 @@ import {
 import { getFixture, patchWithCleanup } from "@web/../tests/helpers/utils";
 import { doAction, getActionManagerServerData } from "@web/../tests/webclient/helpers";
 
-const { afterNextRender } = App;
-
 // load emoji data and lamejs once, when the test suite starts.
 QUnit.begin(loadEmoji);
 QUnit.begin(loadLamejs);
@@ -102,7 +100,7 @@ function getOpenDiscuss(webClient, { context = {}, params = {}, ...props } = {})
                 id: threadId,
             })
         );
-        return afterNextRender(() => doAction(webClient, actionOpenDiscuss, { props }));
+        await doAction(webClient, actionOpenDiscuss, { props });
     };
 }
 
@@ -248,20 +246,16 @@ async function start(param0 = {}) {
     param0.serverData = param0.serverData || getActionManagerServerData();
     param0.serverData.models = { ...pyEnv.getData(), ...param0.serverData.models };
     param0.serverData.views = { ...pyEnv.getViews(), ...param0.serverData.views };
-    let webClient;
-    await afterNextRender(async () => {
-        webClient = await getWebClientReady({ ...param0, messagingBus });
-    });
+    const webClient = await getWebClientReady({ ...param0, messagingBus });
     if (webClient.env.services.ui.isSmall) {
         target.style.width = "100%";
     }
     const openView = async (action, options) => {
         action["type"] = action["type"] || "ir.actions.act_window";
-        await afterNextRender(() => doAction(webClient, action, { props: options }));
+        await doAction(webClient, action, { props: options });
     };
     return {
         advanceTime,
-        afterNextRender,
         env: webClient.env,
         insertText,
         openDiscuss: getOpenDiscuss(webClient, discuss),

addons/web/__manifest__.py

@@ -447,11 +447,6 @@ This module provides the core of the Odoo Web Client.
             ('include', 'web.assets_tests'),
             'web/static/tests/ignore_missing_deps_stop.js',
         ],
-        # remove this bundle alongside the owl2 compatibility layer
-        'web.assets_backend_tests': [
-            ('include', 'web.assets_backend'),
-            ('after', 'web/static/src/libs/owl.js', 'web/static/tests/owl2_compatibility_app.js'),
-        ],
         'web.tests_assets': [
             'web/static/tests/patch_translations.js',
             'web/static/lib/qunit/qunit-2.9.1.css',

addons/web/static/tests/owl2_compatibility_app.js

@@ -1,99 +0,0 @@
-(function () {
-    const App = owl.App;
-
-    const stopPromises = [];
-    const schedulers = new Set();
-
-    function isRunning(scheduler) {
-        for (const fiber of scheduler.tasks) {
-            if (fiber.node.status !== 2) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function hookIntoScheduler(scheduler) {
-        const { flush: originalFlush } = scheduler;
-        scheduler.flush = function flush() {
-            originalFlush.call(this, ...arguments);
-            window.requestAnimationFrame(() => {
-                if ([...schedulers].every((scheduler) => !isRunning(scheduler))) {
-                    while (stopPromises.length) {
-                        stopPromises.pop().resolve();
-                    }
-                }
-            });
-        };
-    }
-
-    owl.App = class extends App {
-        constructor() {
-            super(...arguments);
-            this.setup();
-            hookIntoScheduler(this.scheduler);
-            schedulers.add(this.scheduler);
-        }
-        destroy() {
-            schedulers.delete(this.scheduler);
-            super.destroy();
-        }
-        setup() {}
-    };
-
-    /**
-     * Returns a promise resolved the next time OWL stops rendering.
-     *
-     * @param {function} func function which, when called, is
-     *   expected to trigger OWL render(s).
-     * @param {number} [timeoutDelay=5000] in ms
-     * @returns {Promise}
-     */
-    owl.App.afterNextRender = async function afterNextRender(func, timeoutDelay = 5000) {
-        // Define the potential errors outside of the promise to get a proper
-        // trace if they happen.
-        const startError = new Error("Timeout: the render didn't start.");
-        const stopError = new Error("Timeout: the render didn't stop.");
-        // Set up the timeout to reject if no render happens.
-        let timeoutNoRender;
-
-        const timeoutProm = new Promise((resolve, reject) => {
-            timeoutNoRender = setTimeout(() => {
-                let error = startError;
-                const runningSchedulers = [...schedulers].filter(isRunning);
-                if (runningSchedulers.length) {
-                    error = stopError;
-                }
-                console.warn(
-                    error,
-                    runningSchedulers.map((s) => [...s.tasks].map((f) => [f, f.node.status])),
-                    runningSchedulers
-                );
-                reject(error);
-            }, timeoutDelay);
-        });
-        // Set up the promise to resolve if a render happens.
-        let resolve;
-        const prom = new Promise((res) => {
-            resolve = res;
-        });
-        prom.resolve = resolve;
-        stopPromises.push(prom);
-        // Start the function expected to trigger a render after the promise
-        // has been registered to not miss any potential render.
-        const funcRes = func();
-        // Make them race (first to resolve/reject wins).
-        await Promise.race([prom, timeoutProm]);
-        clearTimeout(timeoutNoRender);
-        // Wait the end of the function to ensure all potential effects are
-        // taken into account during the following verification step.
-        await funcRes;
-        // Wait one more frame to make sure no new render has been queued.
-        await new Promise(function (resolve) {
-            setTimeout(() => window.requestAnimationFrame(() => resolve()));
-        });
-        if ([...schedulers].some(isRunning)) {
-            await afterNextRender(() => {}, timeoutDelay);
-        }
-    };
-})();

addons/web/views/webclient_templates.xml

@@ -210,7 +210,7 @@
             <t t-set="html_data" t-value="{'style': 'height: 100%;'}"/>
             <t t-set="title">Web Tests</t>
             <t t-set="head">
-                <t t-call-assets="web.assets_backend_tests"/>
+                <t t-call-assets="web.assets_backend"/>
 
                 <t t-call="web.test_helpers"/>
 
@@ -229,7 +229,7 @@
             <t t-set="head">
                 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
 
-                <t t-call-assets="web.assets_backend_tests"/>
+                <t t-call-assets="web.assets_backend"/>
 
                 <t t-call="web.test_helpers"/>