From 796e80ec2dafbd05e35dd7baf00f215393e9260c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 16 Nov 2012 11:14:17 +0100 Subject: [PATCH] [FIX] deferred.pipe -> deferred.then bzr revid: xmo@openerp.com-20121116101417-mkcjrdtocl6w7408 --- addons/web/doc/testing.rst | 8 ++++---- addons/web/static/src/js/testing.js | 8 ++++---- addons/web/static/test/testing.js | 10 +++++----- addons/web_tests_demo/static/test/demo.js | 8 ++++---- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/web/doc/testing.rst b/addons/web/doc/testing.rst index 27574019ea6..fea6f8e2616 100644 --- a/addons/web/doc/testing.rst +++ b/addons/web/doc/testing.rst @@ -367,7 +367,7 @@ To do this, set the :js:attr:`rpc option ` to // actual test code return new instance.web.Model('people.famous') - .call('name_search', {name: 'bob'}).pipe(function (result) { + .call('name_search', {name: 'bob'}).then(function (result) { strictEqual(result.length, 3, "shoud return 3 people"); strictEqual(result[0][1], "Microsoft Bob", "the most famous bob should be Microsoft Bob"); @@ -397,7 +397,7 @@ To do this, set the :js:attr:`rpc option ` to // widget needs that or it blows up instance.webclient = {toggle_bars: openerp.testing.noop}; var dbm = new instance.web.DatabaseManager({}); - return dbm.appendTo($s).pipe(function () { + return dbm.appendTo($s).then(function () { ok(fetched_dbs, "should have fetched databases"); ok(fetched_langs, "should have fetched languages"); deepEqual(dbm.db_list, ['foo', 'bar', 'baz']); @@ -446,9 +446,9 @@ then the actual test:: test('actual RPC', {rpc: 'rpc', asserts: 4}, function (instance) { var Model = new instance.web.Model('web_tests_demo.model'); return Model.call('create', [{name: "Bob"}]) - .pipe(function (id) { + .then(function (id) { return Model.call('read', [[id]]); - }).pipe(function (records) { + }).then(function (records) { strictEqual(records.length, 1); var record = records[0]; strictEqual(record.name, "Bob"); diff --git a/addons/web/static/src/js/testing.js b/addons/web/static/src/js/testing.js index fb8ebc25044..b0d744ae006 100644 --- a/addons/web/static/src/js/testing.js +++ b/addons/web/static/src/js/testing.js @@ -74,7 +74,7 @@ openerp.testing = {}; ).promise(); } try { - return $.when(fn.apply(null, params)).pipe(function (result) { + return $.when(fn.apply(null, params)).then(function (result) { // Wrap for RPC layer unwrapper thingy return {result: result}; }); @@ -121,7 +121,7 @@ openerp.testing = {}; } catch (e) { actual_call = $.Deferred().reject(e); } - actual_call.pipe(success, failure); + actual_call.then(success, failure); } }; var teardown = function () { @@ -320,7 +320,7 @@ openerp.testing = {}; {name: 'db_original_name', value: db.source}, {name: 'db_name', value: dbname} ] - }).pipe(function (result) { + }).then(function (result) { if (result.error) { return $.Deferred().reject(result.error).promise(); } @@ -333,7 +333,7 @@ openerp.testing = {}; {name: 'drop_pwd', value: db.supadmin}, {name: 'drop_db', value: dbname} ] - }).pipe(function (result) { + }).then(function (result) { if (result.error) { return $.Deferred().reject(result.error).promise(); } diff --git a/addons/web/static/test/testing.js b/addons/web/static/test/testing.js index 919143ab533..72c2c3562d7 100644 --- a/addons/web/static/test/testing.js +++ b/addons/web/static/test/testing.js @@ -28,7 +28,7 @@ openerp.testing.section('testing.stack', function (test) { var s = openerp.testing.Stack(); return s.execute(function () { throw new Error("foo"); - }).pipe(reject, function (f) { + }).then(reject, function (f) { strictEqual(f.message, "foo", "should reject with exception"); return $.when(); }); @@ -39,7 +39,7 @@ openerp.testing.section('testing.stack', function (test) { return $.Deferred(function (d) { d.reject("failed"); }); - }).pipe(reject, function (f) { + }).then(reject, function (f) { strictEqual(f, "failed", "should propagate failure"); return $.when(); }); @@ -194,7 +194,7 @@ openerp.testing.section('testing.stack', function (test) { }).execute(function () { code = true; return 42; - }).pipe(reject, function (m) { + }).then(reject, function (m) { ok(setup, "should have executed first setup function"); ok(teardown, "should have executed first teardown function"); ok(!teardown2, "should not have executed second teardown function"); @@ -215,7 +215,7 @@ openerp.testing.section('testing.stack', function (test) { return $.Deferred().reject('Fail 3'); }).execute(function () { return 42; - }).pipe(reject, function (m) { + }).then(reject, function (m) { strictEqual(teardowns, 3, "should have tried executing all teardowns"); strictEqual(m, "Fail 3", "should return first failure message"); @@ -231,7 +231,7 @@ openerp.testing.section('testing.stack', function (test) { return $.Deferred().reject('Fail 2'); }).execute(function () { return $.Deferred().reject("code"); - }).pipe(reject, function (m) { + }).then(reject, function (m) { strictEqual(teardowns, 2, "should have tried executing all teardowns"); strictEqual(m, "code", "should return first failure message"); diff --git a/addons/web_tests_demo/static/test/demo.js b/addons/web_tests_demo/static/test/demo.js index 62cecf6f088..b2d54c83d68 100644 --- a/addons/web_tests_demo/static/test/demo.js +++ b/addons/web_tests_demo/static/test/demo.js @@ -58,7 +58,7 @@ openerp.testing.section('basic section', function (test) { ]; }); return new instance.web.Model('people.famous') - .call('name_search', {name: 'bob'}).pipe(function (result) { + .call('name_search', {name: 'bob'}).then(function (result) { strictEqual(result.length, 3, "shoud return 3 people"); strictEqual(result[0][1], "Microsoft Bob", "the most famous bob should be Microsoft Bob"); @@ -78,7 +78,7 @@ openerp.testing.section('basic section', function (test) { // widget needs that or it blows up instance.webclient = {toggle_bars: openerp.testing.noop}; var dbm = new instance.web.DatabaseManager({}); - return dbm.appendTo($s).pipe(function () { + return dbm.appendTo($s).then(function () { ok(fetched_dbs, "should have fetched databases"); ok(fetched_langs, "should have fetched languages"); deepEqual(dbm.db_list, ['foo', 'bar', 'baz']); @@ -88,9 +88,9 @@ openerp.testing.section('basic section', function (test) { test('actual RPC', {rpc: 'rpc', asserts: 4}, function (instance) { var Model = new instance.web.Model('web_tests_demo.model'); return Model.call('create', [{name: "Bob"}]) - .pipe(function (id) { + .then(function (id) { return Model.call('read', [[id]]); - }).pipe(function (records) { + }).then(function (records) { strictEqual(records.length, 1); var record = records[0]; strictEqual(record.name, "Bob");