summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/test_support.js
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2012-10-30 15:06:30 +0100
committerFabien Meghazi <fme@openerp.com>2012-10-30 15:06:30 +0100
commitca6c49becf9ce72e4f1a37f04bc89dae417be196 (patch)
treeed310de02126375971a7becd6bfc0aab58a13ef3 /addons/web/static/src/js/test_support.js
parenteb1c4d0f93bcaf77bfe00adea11df5d7d40c8c20 (diff)
[IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'
bzr revid: fme@openerp.com-20121030140630-gf20ye8fou1ebxft
Diffstat (limited to 'addons/web/static/src/js/test_support.js')
-rw-r--r--addons/web/static/src/js/test_support.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js
index 8e1317ba2b0..90173f89845 100644
--- a/addons/web/static/src/js/test_support.js
+++ b/addons/web/static/src/js/test_support.js
@@ -32,20 +32,20 @@ openerp.test_support = {
window.openerp.web[tested_core](oe);
var done = openerp.test_support.setup_session(oe.session);
if (nonliterals) {
- done = done.pipe(function () {
+ done = done.then(function () {
return oe.session.rpc('/tests/add_nonliterals', {
domains: nonliterals.domains || [],
contexts: nonliterals.contexts || []
- }).then(function (r) {
+ }).done(function (r) {
oe.domains = r.domains;
oe.contexts = r.contexts;
});
});
}
done.always(QUnit.start)
- .then(function () {
+ .done(function () {
conf.openerp = oe;
- }, function (e) {
+ }).fail(function (e) {
QUnit.test(title, function () {
console.error(e);
QUnit.ok(false, 'Could not obtain a session:' + e.debug);