[MERGE] trunk

bzr revid: csaba.toth@i3rendszerhaz.hu-20121129114132-gfe3sn1p5t0mzofm

1 files changed, 13 insertions, 13 deletions

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index 20534eff76a..45f6d2c715b 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -152,9 +152,9 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
     instance.dummy = {};
     instance.dummy.DummyWidget = instance.web.search.Field.extend(
         dummy_widget_attributes || {});
-    if (!('/web/searchview/load' in instance.session.responses)) {
-        instance.session.responses['/web/searchview/load'] = function () {
-            return {fields_view: {
+    if (!('/web/view/load' in instance.session.responses)) {
+        instance.session.responses['/web/view/load'] = function () {
+            return {
                 type: 'search',
                 fields: {
                     dummy: {type: 'char', string: "Dummy"}
@@ -171,16 +171,16 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
                         children: []
                     }]
                 }
-            }};
+            };
         };
     }
-    instance.session.responses['/web/searchview/get_filters'] = function () {
+    instance.session.responses['ir.filters:get_filters'] = function () {
         return [];
     };
-    instance.session.responses['/web/searchview/fields_get'] = function () {
-        return {fields: {
+    instance.session.responses['dummy.model:fields_get'] = function () {
+        return {
             dummy: {type: 'char', string: 'Dummy'}
-        }};
+        };
     };
 
     var dataset = {model: 'dummy.model', get_context: function () { return {}; }};
@@ -890,9 +890,9 @@ openerp.testing.section('filters', {
     rpc: 'mock',
     templates: true,
     setup: function (instance, $s, mock) {
-        mock('/web/searchview/load', function () {
+        mock('/web/view/load', function () {
             // view with a single group of filters
-            return {fields_view: {
+            return {
                 type: 'search',
                 fields: {},
                 arch: {
@@ -915,7 +915,7 @@ openerp.testing.section('filters', {
                         children: []
                     }]
                 }
-            }};
+            };
         });
     }
 }, function (test) {
@@ -992,7 +992,7 @@ openerp.testing.section('saved_filters', {
 }, function (test) {
     test('checkboxing', {asserts: 6}, function (instance, $fix, mock) {
         var view = makeSearchView(instance);
-        mock('/web/searchview/get_filters', function () {
+        mock('ir.filters:get_filters', function () {
             return [{ name: "filter name", user_id: 42 }];
         });
 
@@ -1015,7 +1015,7 @@ openerp.testing.section('saved_filters', {
     });
     test('removal', {asserts: 1}, function (instance, $fix, mock) {
         var view = makeSearchView(instance);
-        mock('/web/searchview/get_filters', function () {
+        mock('ir.filters:get_filters', function () {
             return [{ name: "filter name", user_id: 42 }];
         });