tsm-odoo
f7e0da7b71
Before this commit the error raised/logged when rejecting the afterEvent promise was imcomplete. This is due to the fact we're creating the error inside the promise itself. In order to get a better stack trace, the error is now declared outside of the promise. Moreover, both `afterNextRender` and `afterEvent` functions were using `console.error` before rejecting the promise. This is also a problem since runbot will show the error printed by `console.error` instead of the one of the test failure. In order to solve this issue, those two `console.error` have been replaced by `console.warn`. closes odoo/odoo#99899 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
90 lines
3.3 KiB
JavaScript
90 lines
3.3 KiB
JavaScript
(function () {
|
|
const App = owl.App;
|
|
|
|
const stopPromises = [];
|
|
const schedulers = new Set();
|
|
|
|
function hookIntoScheduler(scheduler) {
|
|
const { flush: originalFlush } = scheduler;
|
|
scheduler.flush = function flush() {
|
|
originalFlush.call(this, ...arguments);
|
|
window.requestAnimationFrame(() => {
|
|
if ([...schedulers].every(({ tasks }) => tasks.size === 0)) {
|
|
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(({ tasks }) => tasks.size > 0);
|
|
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(({ tasks }) => tasks.size > 0)) {
|
|
await afterNextRender(() => {}, timeoutDelay);
|
|
}
|
|
};
|
|
})();
|