2 files changed, 25 insertions, 17 deletions
diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js
index 534fa4fbea9..76c97b10d70 100644
--- a/addons/web/static/tests/views/form_tests.js
+++ b/addons/web/static/tests/views/form_tests.js
@@ -8,6 +8,7 @@ var core = require('web.core');
 var fieldRegistry = require('web.field_registry');
 var FormView = require('web.FormView');
 var mixins = require('web.mixins');
+var NotificationService = require('web.NotificationService');
 var pyeval = require('web.pyeval');
 var testUtils = require('web.test_utils');
 var widgetRegistry = require('web.widget_registry');
@@ -2669,13 +2670,17 @@ QUnit.module('Views', {
             arch: '<form string="Partners">' +
                         '<group><field name="foo"/></group>' +
                 '</form>',
-        });
-
-        testUtils.intercept(form, 'warning', function (event) {
-            assert.strictEqual(event.data.title, 'The following fields are invalid:',
-                "should have a warning with correct title");
-            assert.strictEqual(event.data.message, '<ul><li>Foo</li></ul>',
-                "should have a warning with correct message");
+            services: [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");
+                }
+            })],
         });
 
         form.$buttons.find('.o_form_button_save').click();
@@ -4713,11 +4718,11 @@ QUnit.module('Views', {
                 }
                 return result;
             },
-            intercepts: {
-                warning: function () {
-                    assert.step('warning');
-                },
-            },
+            services: [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 c42fbfc4725..fd2f77f068d 100644
--- a/addons/web/static/tests/views/list_tests.js
+++ b/addons/web/static/tests/views/list_tests.js
@@ -8,6 +8,7 @@ var basicFields = require('web.basic_fields');
 var FormView = require('web.FormView');
 var ListView = require('web.ListView');
 var mixins = require('web.mixins');
+var NotificationService = require('web.NotificationService');
 var testUtils = require('web.test_utils');
 var widgetRegistry = require('web.widget_registry');
 var Widget = require('web.Widget');
@@ -2095,11 +2096,13 @@ QUnit.module('Views', {
                     '<field name="foo" required="1"/>' +
                     '<field name="bar"/>' +
                 '</tree>',
-            intercepts: {
-                warning: function () {
-                    warnings++;
-                },
-            },
+            services: [NotificationService.extend({
+                notify: function (params) {
+                    if (params.type === 'warning') {
+                        warnings++;
+                    }
+                }
+            })],
         });
 
         // Start first line edition