summaryrefslogtreecommitdiff
path: root/addons/web/static
diff options
context:
space:
mode:
authorRomain Derie <rde@odoo.com>2019-06-06 11:13:43 +0200
committerJeremy Kersten <jke@odoo.com>2019-06-06 15:08:04 +0200
commitaebbd0317f20c95d2fae9599bf56c840a2d30322 (patch)
treecb071f3a174b83b956639c13c90614f5e346e18b /addons/web/static
parent4f18c7c44bbe3d1b6adacd0ee5bd2e18a9316b38 (diff)
[FIX] mail, web: directly load async debug.xml during QUnit tests
Before this commit, the test `list: edit view menu item` would sometimes crash as now the debug manager loads its templates with an `xmlDependencies` where it was not the case before (included in base.xml), see 73327db0656bf.
Diffstat (limited to 'addons/web/static')
-rw-r--r--addons/web/static/tests/helpers/test_utils.js1
-rw-r--r--addons/web/static/tests/tools/debug_manager_tests.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index ccf5d8daf6b..460bd9f4f78 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -102,6 +102,7 @@ async function nextTick() {
// to load xml files that are normally lazy loaded by specific widgets).
return Promise.all([
session.is_bound,
+ ajax.loadXML('/web/static/src/xml/debug.xml', core.qweb),
ajax.loadXML('/web/static/src/xml/dialog.xml', core.qweb)
]).then(function () {
setTimeout(function () {
diff --git a/addons/web/static/tests/tools/debug_manager_tests.js b/addons/web/static/tests/tools/debug_manager_tests.js
index 0de3d5857e0..0f850835c66 100644
--- a/addons/web/static/tests/tools/debug_manager_tests.js
+++ b/addons/web/static/tests/tools/debug_manager_tests.js
@@ -13,7 +13,7 @@ QUnit.module('DebugManager', {}, function () {
var debugManager = createDebugManager();
- debugManager.appendTo($('#qunit-fixture'));
+ await debugManager.appendTo($('#qunit-fixture'));
// Simulate update debug manager from web client
var action = {