[MERGE] forward port of branch 8.0 up to ed1c173

2 files changed, 13 insertions, 2 deletions

diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index ef2d608bc5d..a91d5012123 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -6,6 +6,9 @@ openerp.testing.section('editor', {
         mock('test.model:create', function () {
             return 42;
         });
+        mock('test.model:onchange', function () {
+            return {};
+        });
     }
 }, function (test) {
     /**
@@ -203,6 +206,9 @@ openerp.testing.section('list.edition', {
                 arch: '<tree><field name="a"/><field name="b"/><field name="c"/></tree>',
             };
         });
+        mock('demo:onchange', function () {
+            return {};
+        });
     }
 }, function (test) {
     test('newrecord', {asserts: 6}, function (instance, $fix, mock) {
@@ -311,6 +317,11 @@ openerp.testing.section('list.edition.onwrite', {
     dependencies: ['web.list_editable'],
     rpc: 'mock',
     templates: true,
+    setup: function (instance, $s, mock) {
+        mock('demo:onchange', function () {
+            return {};
+        });
+    }
 }, function (test) {
     test('record-to-read', {asserts: 4}, function (instance, $fix, mock) {
         mock('demo:fields_view_get', function () {
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index d93cb131e05..828347b68a5 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -157,7 +157,7 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
             return {
                 type: 'search',
                 fields: {
-                    dummy: {type: 'char', string: "Dummy"}
+                    dummy: {type: 'char', string: "Dummy", searchable: true}
                 },
                 arch: '<search><field name="dummy" widget="dummy"/></search>'
             };
@@ -168,7 +168,7 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
     };
     instance.session.responses['dummy.model:fields_get'] = function () {
         return {
-            dummy: {type: 'char', string: 'Dummy'}
+            dummy: {type: 'char', string: 'Dummy', searchable: true}
         };
     };
     instance.client = { action_manager: { inner_action: undefined } };