[MERGE] upstream

bzr revid: fme@openerp.com-20130807100643-0olinq3584kzc3we

1 files changed, 15 insertions, 13 deletions

diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js
index 880da9f1bc1..a7768f0ca24 100644
--- a/addons/web/static/src/js/testing.js
+++ b/addons/web/static/src/js/testing.js
@@ -3,13 +3,12 @@ openerp.testing = {};
 (function (testing) {
     var dependencies = {
         pyeval: [],
-        corelib: ['pyeval'],
-        coresetup: ['corelib'],
-        data: ['corelib', 'coresetup'],
+        core: ['pyeval'],
+        data: ['core'],
         dates: [],
-        formats: ['coresetup', 'dates'],
-        chrome: ['corelib', 'coresetup'],
-        views: ['corelib', 'coresetup', 'data', 'chrome'],
+        formats: ['core', 'dates'],
+        chrome: ['core'],
+        views: ['core', 'data', 'chrome'],
         search: ['views', 'formats'],
         list: ['views', 'data'],
         form: ['data', 'views', 'list', 'formats'],
@@ -53,31 +52,34 @@ openerp.testing = {};
     testing.mockifyRPC = function (instance, responses) {
         var session = instance.session;
         session.responses = responses || {};
-        session.rpc_function = function (url, payload) {
+        session.rpc = function(url, rparams, options) {
+            if (_.isString(url)) {
+                url = {url: url};
+            }
             var fn, params;
-            var needle = payload.params.model + ':' + payload.params.method;
+            var needle = rparams.model + ':' + rparams.method;
             if (url.url === '/web/dataset/call_kw'
                 && needle in this.responses) {
                 fn = this.responses[needle];
                 params = [
-                    payload.params.args || [],
-                    payload.params.kwargs || {}
+                    rparams.args || [],
+                    rparams.kwargs || {}
                 ];
             } else {
                 fn = this.responses[url.url];
-                params = [payload];
+                params = [{params: rparams}];
             }
 
             if (!fn) {
                 return $.Deferred().reject({}, 'failed',
                     _.str.sprintf("Url %s not found in mock responses, with arguments %s",
-                                  url.url, JSON.stringify(payload.params))
+                                  url.url, JSON.stringify(rparams))
                 ).promise();
             }
             try {
                 return $.when(fn.apply(null, params)).then(function (result) {
                     // Wrap for RPC layer unwrapper thingy
-                    return {result: result};
+                    return result;
                 });
             } catch (e) {
                 // not sure why this looks like that