diff options
Diffstat (limited to 'addons/web/static/tests')
| -rw-r--r-- | addons/web/static/tests/chrome/action_manager_tests.js | 67 | ||||
| -rw-r--r-- | addons/web/static/tests/helpers/test_utils.js | 10 | ||||
| -rw-r--r-- | addons/web/static/tests/services/notification_service_tests.js | 4 | ||||
| -rw-r--r-- | addons/web/static/tests/views/form_tests.js | 34 | ||||
| -rw-r--r-- | addons/web/static/tests/views/list_tests.js | 14 |
5 files changed, 75 insertions, 54 deletions
diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js index f59f3b30767..f68d343061f 100644 --- a/addons/web/static/tests/chrome/action_manager_tests.js +++ b/addons/web/static/tests/chrome/action_manager_tests.js @@ -1044,7 +1044,6 @@ QUnit.module('ActionManager', { assert.expect(14); var RamStorageService = AbstractStorageService.extend({ - name: 'session_storage', storage: new RamStorage(), }); @@ -1052,7 +1051,9 @@ QUnit.module('ActionManager', { actions: this.actions, archs: this.archs, data: this.data, - services: [RamStorageService], + services: { + session_storage: RamStorageService, + }, mockRPC: function (route, args) { assert.step(args.method || route); return this._super.apply(this, arguments); @@ -1821,7 +1822,9 @@ QUnit.module('ActionManager', { actions: this.actions, archs: this.archs, data: this.data, - services: [ReportService], + services: { + report: ReportService, + }, mockRPC: function (route, args) { assert.step(args.method || route); if (route === '/report/check_wkhtmltopdf') { @@ -1862,11 +1865,14 @@ QUnit.module('ActionManager', { actions: this.actions, archs: this.archs, data: this.data, - services: [ReportService, NotificationService.extend({ - notify: function (params) { - assert.step(params.type || 'notification'); - } - })], + services: { + report: ReportService, + notification: NotificationService.extend({ + notify: function (params) { + assert.step(params.type || 'notification'); + } + }), + }, mockRPC: function (route, args) { assert.step(args.method || route); if (route === '/report/check_wkhtmltopdf') { @@ -1916,11 +1922,14 @@ QUnit.module('ActionManager', { actions: this.actions, archs: this.archs, data: this.data, - services: [ReportService, NotificationService.extend({ - notify: function (params) { - assert.step(params.type || 'notification'); - } - })], + services: { + report: ReportService, + notification: NotificationService.extend({ + notify: function (params) { + assert.step(params.type || 'notification'); + } + }) + }, mockRPC: function (route, args) { assert.step(args.method || route); if (route === '/report/check_wkhtmltopdf') { @@ -2979,12 +2988,14 @@ QUnit.module('ActionManager', { actions: this.actions, archs: this.archs, data: this.data, - services: [SessionStorageService.extend({ - setItem: function (key, value) { - assert.strictEqual(value, JSON.stringify(expectedAction), - "should store the executed action in the sessionStorage"); - }, - })], + services: { + session_storage: SessionStorageService.extend({ + setItem: function (key, value) { + assert.strictEqual(value, JSON.stringify(expectedAction), + "should store the executed action in the sessionStorage"); + }, + }), + }, }); actionManager.doAction(3); @@ -3010,14 +3021,16 @@ QUnit.module('ActionManager', { actions: this.actions, archs: this.archs, data: this.data, - services: [SessionStorageService.extend({ - setItem: function (key, value) { - if (checkSessionStorage) { - assert.strictEqual(value, JSON.stringify(expectedAction), - "should correctly store the executed action in the sessionStorage"); - } - }, - })], + services: { + session_storage: SessionStorageService.extend({ + setItem: function (key, value) { + if (checkSessionStorage) { + assert.strictEqual(value, JSON.stringify(expectedAction), + "should correctly store the executed action in the sessionStorage"); + } + }, + }), + }, }); // execute an action and open a record in form view diff --git a/addons/web/static/tests/helpers/test_utils.js b/addons/web/static/tests/helpers/test_utils.js index a1b2718fc1a..eb558af5deb 100644 --- a/addons/web/static/tests/helpers/test_utils.js +++ b/addons/web/static/tests/helpers/test_utils.js @@ -427,15 +427,15 @@ function addMockEnvironment(widget, params) { // Deploy services var done = false; while (!done) { - var index = _.findIndex(params.services, function (Service) { + var serviceName = _.findKey(params.services, function (Service) { return !_.some(Service.prototype.dependencies, function (depName) { return !_.has(services, depName); }); }); - if (index !== -1) { - var Service = params.services.splice(index, 1)[0]; - services[Service.prototype.name] = new Service(widget); - services[Service.prototype.name].start(); + if (serviceName) { + var service = services[serviceName] = new params.services[serviceName](widget); + delete params.services[serviceName]; + service.start(); } else { done = true; } diff --git a/addons/web/static/tests/services/notification_service_tests.js b/addons/web/static/tests/services/notification_service_tests.js index aff3de8cc39..ac8603ae6f3 100644 --- a/addons/web/static/tests/services/notification_service_tests.js +++ b/addons/web/static/tests/services/notification_service_tests.js @@ -25,7 +25,9 @@ QUnit.module('Services', { }, }, model: 'fake_model', - services: [NotificationService], + services: { + notification: NotificationService, + }, }; }, afterEach: function () { diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js index 9d4f6a0e9ad..219972f46c9 100644 --- a/addons/web/static/tests/views/form_tests.js +++ b/addons/web/static/tests/views/form_tests.js @@ -2850,17 +2850,19 @@ QUnit.module('Views', { arch: '<form string="Partners">' + '<group><field name="foo"/></group>' + '</form>', - services: [NotificationService.extend({ - notify: function (params) { - if (params.type !== 'warning') { - return; + services: { + notification: NotificationService.extend({ + notify: function (params) { + if (params.type !== 'warning') { + return; + } + assert.strictEqual(params.title, 'The following fields are invalid:', + "should have a warning with correct title"); + assert.strictEqual(params.message, '<ul><li>Foo</li></ul>', + "should have a warning with correct message"); } - assert.strictEqual(params.title, 'The following fields are invalid:', - "should have a warning with correct title"); - assert.strictEqual(params.message, '<ul><li>Foo</li></ul>', - "should have a warning with correct message"); - } - })], + }), + }, }); form.$buttons.find('.o_form_button_save').click(); @@ -4934,11 +4936,13 @@ QUnit.module('Views', { } return result; }, - services: [NotificationService.extend({ - notify: function (params) { - assert.step(params.type); - } - })], + services: { + notification: NotificationService.extend({ + notify: function (params) { + assert.step(params.type); + } + }), + }, }); form.$buttons.find('.o_form_button_edit').click(); diff --git a/addons/web/static/tests/views/list_tests.js b/addons/web/static/tests/views/list_tests.js index 1b4b8f64153..b63ba83ae85 100644 --- a/addons/web/static/tests/views/list_tests.js +++ b/addons/web/static/tests/views/list_tests.js @@ -2154,13 +2154,15 @@ QUnit.module('Views', { '<field name="foo" required="1"/>' + '<field name="bar"/>' + '</tree>', - services: [NotificationService.extend({ - notify: function (params) { - if (params.type === 'warning') { - warnings++; + services: { + notification: NotificationService.extend({ + notify: function (params) { + if (params.type === 'warning') { + warnings++; + } } - } - })], + }), + }, }); // Start first line edition |