diff --git a/addons/mail/static/tests/helpers/mock_server.js b/addons/mail/static/tests/helpers/mock_server.js index f0c09386a5a..a2aef300736 100644 --- a/addons/mail/static/tests/helpers/mock_server.js +++ b/addons/mail/static/tests/helpers/mock_server.js @@ -4,6 +4,24 @@ odoo.define('mail.MockServer', function (require) { var MockServer = require('web.MockServer'); MockServer.include({ + /** + * Param 'data' may have a key 'initMessaging' which contains + * a partial overwrite of the result from mockInitMessaging. + * + * Note: we must delete this key, so that this is not + * handled as a model definition. + * + * @override + * @param {Object} [data.initMessaging] + */ + init: function (data, options) { + if (data && data.initMessaging) { + this.initMessagingData = data.initMessaging; + delete data.initMessaging; + } + this._super.apply(this, arguments); + }, + /** * Simulate the '/mail/init_messaging' route * @@ -11,7 +29,7 @@ MockServer.include({ * @return {Object} */ _mockInitMessaging: function () { - return { + return _.defaults(this.initMessagingData || {}, { 'needaction_inbox_counter': 0, 'starred_counter': 0, 'channel_slots': [], @@ -19,7 +37,7 @@ MockServer.include({ 'mention_partner_suggestions': [], 'shortcodes': [], 'menu_id': false, - }; + }); }, /** * @override diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml index 28d92c9e157..6769462d404 100644 --- a/addons/mail/views/mail_templates.xml +++ b/addons/mail/views/mail_templates.xml @@ -54,6 +54,8 @@