From da1138758702ba91ff09c4af65c7efca0867b755 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Fri, 29 Sep 2017 16:30:43 +0200
Subject: [PATCH] [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.
---
 .../mail/static/tests/client_action_tests.js  |  8 ++----
 .../tests/fields/relational_fields_tests.js   | 28 +++++--------------
 addons/web/static/tests/helpers/test_utils.js | 10 +++++--
 addons/web/static/tests/views/kanban_tests.js |  4 +--
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/addons/mail/static/tests/client_action_tests.js b/addons/mail/static/tests/client_action_tests.js
index 84bcc590328..378328037fd 100644
--- a/addons/mail/static/tests/client_action_tests.js
+++ b/addons/mail/static/tests/client_action_tests.js
@@ -22,9 +22,7 @@ QUnit.module('Discuss client action', {
                 archs: {
                     'mail.message,false,search': '<search/>',
                 },
-                config: {
-                    isMobile: true
-                },
+                config: {device: {isMobile: true}},
             });
             var chatAction = new ChatAction(parent, params);
             chatAction.set_cp_bus(new Widget());
@@ -51,9 +49,7 @@ QUnit.skip('mobile basic rendering', function (assert) {
         archs: {
             'mail.message,false,search': '<search/>',
         },
-        config: {
-            isMobile: true,
-        },
+        config: {device: {isMobile: true}},
     });
 
     var params = {
diff --git a/addons/web/static/tests/fields/relational_fields_tests.js b/addons/web/static/tests/fields/relational_fields_tests.js
index bcbf05aef4e..c5b4001e087 100644
--- a/addons/web/static/tests/fields/relational_fields_tests.js
+++ b/addons/web/static/tests/fields/relational_fields_tests.js
@@ -6939,9 +6939,7 @@ QUnit.module('relational_fields', {
                 return this._super.apply(this, arguments);
             },
             res_id: 1,
-            config: {
-                isMobile: false,
-            },
+            config: {device: {isMobile: false}},
         });
 
         assert.strictEqual(count, 1, 'once search_read should have been done to fetch the relational values');
@@ -6990,9 +6988,7 @@ QUnit.module('relational_fields', {
                     '<header><field name="trululu" widget="statusbar" clickable="True"/></header>' +
                 '</form>',
             res_id: 1,
-            config: {
-                isMobile: false,
-            },
+            config: {device: {isMobile: false}},
         });
 
         var $selectedStatus = form.$('.o_statusbar_status button[data-value="4"]');
@@ -7021,9 +7017,7 @@ QUnit.module('relational_fields', {
                     '<header><field name="product_id" widget="statusbar"/></header>' +
                 '</form>',
             res_id: 1,
-            config: {
-                isMobile: false,
-            },
+            config: {device: {isMobile: false}},
         });
 
         assert.ok(form.$('.o_statusbar_status').hasClass('o_field_empty'),
@@ -7046,9 +7040,7 @@ QUnit.module('relational_fields', {
                 '<form string="Partners">' +
                     '<header><field name="trululu" widget="statusbar"/></header>' +
                 '</form>',
-            config: {
-                isMobile: false,
-            },
+            config: {device: {isMobile: false}},
         });
 
         assert.strictEqual(form.$('.o_statusbar_status button:disabled').length, 2, "should have 2 status");
@@ -7070,9 +7062,7 @@ QUnit.module('relational_fields', {
                     '<header><field name="trululu" widget="statusbar" clickable="True"/></header>' +
                 '</form>',
             res_id: 1,
-            config: {
-                isMobile: false,
-            },
+            config: {device: {isMobile: false}},
         });
 
         form.$buttons.find('.o_form_button_edit').click();
@@ -7101,9 +7091,7 @@ QUnit.module('relational_fields', {
                     '<field name="color" widget="statusbar" statusbar_visible="red"/></header>' +
                 '</form>',
             res_id: 1,
-            config: {
-                isMobile: false,
-            },
+            config: {device: {isMobile: false}},
         });
 
         form.$buttons.find('.o_form_button_edit').click();
@@ -7138,9 +7126,7 @@ QUnit.module('relational_fields', {
                 return this._super.apply(this, arguments);
             },
             res_id: 1,
-            config: {
-                isMobile: false,
-            },
+            config: {device: {isMobile: false}},
         });
 
         form.$buttons.find('.o_form_button_edit').click();
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);
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index 2ad0d5e6324..025b0658f0d 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -2116,9 +2116,7 @@ QUnit.module('Views', {
                     '</t></templates>' +
                 '</kanban>',
             groupBy: ['product_id'],
-            config: {
-                isMobile: true
-            }
+            config: {device: {isMobile: true}},
         }).then(function (kanban) {
 
             // Dummy dom update trigger for activate mobile tabs and move to first column