From 707882497b397ce908c49fe0b9ed0e1911f3e6a4 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Fri, 6 Sep 2019 10:56:46 +0000 Subject: [FIX] web: tests: load template before FieldColor tests The ColorPickerDialog lazyloads its template. In the test environment, nothing was done (except for a single nextTick) to ensure that the template has been loaded before interacting with the dialog. This led to non deterministic failing runbot builds. Also correctly load the signature template before running its tests instead of doing two chelou nextTick(); closes odoo/odoo#36511 Signed-off-by: David Monjoie (dmo) --- addons/web/static/tests/fields/basic_fields_tests.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'addons/web/static/tests/fields/basic_fields_tests.js') diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js index 112a1c74b7b..a5620212500 100644 --- a/addons/web/static/tests/fields/basic_fields_tests.js +++ b/addons/web/static/tests/fields/basic_fields_tests.js @@ -1,6 +1,7 @@ odoo.define('web.basic_fields_tests', function (require) { "use strict"; +var ajax = require('web.ajax'); var basicFields = require('web.basic_fields'); var concurrency = require('web.concurrency'); var config = require('web.config'); @@ -12,7 +13,6 @@ var session = require('web.session'); var testUtils = require('web.test_utils'); var field_registry = require('web.field_registry'); -var createView = testUtils.createView; var createView = testUtils.createView; var DebouncedField = basicFields.DebouncedField; var JournalDashboardGraph = basicFields.JournalDashboardGraph; @@ -5817,7 +5817,11 @@ QUnit.module('basic_fields', { form.destroy(); }); - QUnit.module('FieldColor'); + QUnit.module('FieldColor', { + before: function () { + return ajax.loadXML('/web/static/src/xml/colorpicker_dialog.xml', core.qweb); + }, + }); QUnit.test('Field Color: default widget state', async function (assert) { assert.expect(3); @@ -5837,7 +5841,6 @@ QUnit.module('basic_fields', { }); await testUtils.dom.click(form.$('.o_field_color')); - await testUtils.nextTick(); assert.containsOnce($, '.modal'); assert.containsNone($('.modal'), '.o_opacity_slider', "Opacity slider should not be present"); -- cgit v1.2.3