diff options
Diffstat (limited to 'addons/mail/static')
8 files changed, 21 insertions, 27 deletions
diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js index 6f159951436..d04028267c2 100644 --- a/addons/mail/static/src/js/services/mail_manager.js +++ b/addons/mail/static/src/js/services/mail_manager.js @@ -44,7 +44,6 @@ var _lt = core._lt; var PREVIEW_MSG_MAX_SIZE = 350; // optimal for native english speakers var MailManager = AbstractService.extend({ - name: 'mail_service', dependencies: ['ajax', 'bus_service', 'local_storage'], _ODOOBOT_ID: "ODOOBOT", // default authorID for transient messages diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js index c7c082148a0..17f304b067a 100644 --- a/addons/mail/static/tests/chatter_tests.js +++ b/addons/mail/static/tests/chatter_tests.js @@ -424,7 +424,7 @@ QUnit.test('chatter: post, receive and star messages', function (assert) { var done = assert.async(); assert.expect(27); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; this.data.partner.records[0].message_ids = [1]; this.data['mail.message'].records = [{ @@ -784,7 +784,7 @@ QUnit.test('chatter: discard changes on message post with post_refresh "recipien var getSuggestionsDef = $.Deferred(); var messages = []; - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; var form = createView({ View: FormView, model: 'partner', diff --git a/addons/mail/static/tests/discuss_moderation_tests.js b/addons/mail/static/tests/discuss_moderation_tests.js index 8940efa1185..65efc32cc36 100644 --- a/addons/mail/static/tests/discuss_moderation_tests.js +++ b/addons/mail/static/tests/discuss_moderation_tests.js @@ -533,7 +533,7 @@ QUnit.test('author: send message in moderated channel', function (assert) { assert.expect(4); var done = assert.async(); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; var messagePostDef = $.Deferred(); @@ -613,7 +613,7 @@ QUnit.test('author: sent message accepted in moderated channel', function (asser assert.expect(8); var done = assert.async(); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; this.data.initMessaging = { channel_slots: { @@ -696,7 +696,7 @@ QUnit.test('author: sent message rejected in moderated channel', function (asser assert.expect(5); var done = assert.async(); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; this.data.initMessaging = { channel_slots: { diff --git a/addons/mail/static/tests/discuss_tests.js b/addons/mail/static/tests/discuss_tests.js index a061873c39b..9d61a0d2446 100644 --- a/addons/mail/static/tests/discuss_tests.js +++ b/addons/mail/static/tests/discuss_tests.js @@ -146,7 +146,7 @@ QUnit.test('@ mention in channel', function (assert) { assert.expect(34); var done = assert.async(); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; var fetchListenersDef = $.Deferred(); var receiveMessageDef = $.Deferred(); @@ -432,7 +432,7 @@ QUnit.test('"Unstar all" button should reset the starred counter', function (ass assert.expect(2); var done = assert.async(); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; var messageData = []; _.each(_.range(1, 41), function (num) { messageData.push({ @@ -624,7 +624,7 @@ QUnit.test('convert emoji sources to unicodes on message_post', function (assert assert.expect(2); var done = assert.async(); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; var receiveMessageDef = $.Deferred(); this.data.initMessaging = { diff --git a/addons/mail/static/tests/helpers/mock_server.js b/addons/mail/static/tests/helpers/mock_server.js index b7e5f91c87d..4f396b76df5 100644 --- a/addons/mail/static/tests/helpers/mock_server.js +++ b/addons/mail/static/tests/helpers/mock_server.js @@ -21,11 +21,8 @@ MockServer.include({ this.initMessagingData = data.initMessaging; delete data.initMessaging; } - var BusService = _.find(options.services, function (Service) { - return Service.prototype.name === 'bus_service'; - }); - if (BusService) { - this.busBus = BusService.prototype.bus; + if (options.services && options.services.bus_service) { + this.busBus = options.services.bus_service.prototype.bus; } this._super.apply(this, arguments); diff --git a/addons/mail/static/tests/helpers/test_utils.js b/addons/mail/static/tests/helpers/test_utils.js index ff5370d57ab..f90a86bdd41 100644 --- a/addons/mail/static/tests/helpers/test_utils.js +++ b/addons/mail/static/tests/helpers/test_utils.js @@ -74,7 +74,6 @@ function getMailServices() { is_odoo_focused: function () { return true; }, }); var BusService = AbstractService.extend({ - name: 'bus_service', bus: new MockBus(), //-------------------------------------------------------------------------- @@ -89,10 +88,13 @@ function getMailServices() { } }); var LocalStorageService = AbstractStorageService.extend({ - name: 'local_storage', storage: new RamStorage(), }); - return [MailService, BusService, LocalStorageService]; + return { + mail_service: MailService, + bus_service: BusService, + local_storage: LocalStorageService, + }; } return { diff --git a/addons/mail/static/tests/systray/systray_messaging_menu_tests.js b/addons/mail/static/tests/systray/systray_messaging_menu_tests.js index e1c5ef1851c..347233efd31 100644 --- a/addons/mail/static/tests/systray/systray_messaging_menu_tests.js +++ b/addons/mail/static/tests/systray/systray_messaging_menu_tests.js @@ -149,7 +149,7 @@ QUnit.test('messaging menu widget: messaging menu with 1 record', function (asse QUnit.test('messaging menu widget: no crash when clicking on inbox notification not associated to a document', function (assert) { assert.expect(3); - var bus = this.services[1].prototype.bus; + var bus = this.services.bus_service.prototype.bus; var messagingMenu = new MessagingMenu(); testUtils.addMockEnvironment(messagingMenu, { diff --git a/addons/mail/static/tests/thread_window_tests.js b/addons/mail/static/tests/thread_window_tests.js index 724d24f901e..620aae407f6 100644 --- a/addons/mail/static/tests/thread_window_tests.js +++ b/addons/mail/static/tests/thread_window_tests.js @@ -28,30 +28,26 @@ QUnit.module('mail', { }, }; this.services = mailTestUtils.getMailServices(); - - // backup original thread window append to selector - this.MailService = _.find(this.services, function (Service) { - return Service.prototype.name === 'mail_service'; - }); - this.ORIGINAL_THREAD_WINDOW_APPENDTO = this.MailService.prototype.THREAD_WINDOW_APPENDTO; + this.ORIGINAL_THREAD_WINDOW_APPENDTO = this.services.mail_service.prototype.THREAD_WINDOW_APPENDTO; this.createParent = function (params) { var widget = new Widget(); // in non-debug mode, append thread windows in qunit-fixture if (params.debug) { - self.MailService.prototype.THREAD_WINDOW_APPENDTO = 'body'; + self.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = 'body'; } else { - self.MailService.prototype.THREAD_WINDOW_APPENDTO = '#qunit-fixture'; + self.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = '#qunit-fixture'; } + params.services = _.clone(params.services); testUtils.addMockEnvironment(widget, params); return widget; }; }, afterEach: function () { // reset thread window append to body - this.MailService.prototype.THREAD_WINDOW_APPENDTO = 'body'; + this.services.mail_service.prototype.THREAD_WINDOW_APPENDTO = 'body'; }, }, function () { |