summaryrefslogtreecommitdiff
path: root/addons/web/static/tests/helpers/test_utils.js
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2017-09-29 16:30:43 +0200
committerqsm-odoo <qsm@odoo.com>2017-09-29 16:39:06 +0200
commitda1138758702ba91ff09c4af65c7efca0867b755 (patch)
tree016491816073cbd54642bfbafd3ce629fa04988c /addons/web/static/tests/helpers/test_utils.js
parent87560ec8ecbd221e103e10b8d991bf4bb113834f (diff)
[FIX] web, mail: complete commit https://github.com/odoo/odoo/commit/87f1e360a89eb7617d5fd60cad58a143bea441df
Tests are overridding the `config` object directly but this was wrongly done. Also, tests had to be adapted to set the `isMobile` value correctly.
Diffstat (limited to 'addons/web/static/tests/helpers/test_utils.js')
-rw-r--r--addons/web/static/tests/helpers/test_utils.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js
index 60547efed0d..d7c7aa01919 100644
--- a/addons/web/static/tests/helpers/test_utils.js
+++ b/addons/web/static/tests/helpers/test_utils.js
@@ -272,8 +272,14 @@ function addMockEnvironment(widget, params) {
_.extend(session, params.session);
}
if ('config' in params) {
- initialConfig = _.extend({}, config);
- _.extend(config, params.config);
+ initialConfig = _.clone(config);
+ initialConfig.device = _.clone(config.device);
+ if ('device' in params.config) {
+ _.extend(config.device, params.config.device);
+ }
+ if ('debug' in params.config) {
+ config.debug = params.config.debug;
+ }
}
if ('translateParameters' in params) {
initialParameters = _.extend({}, core._t.database.parameters);