summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/test_support.js
diff options
context:
space:
mode:
authorJigar Amin - OpenERP <jam@tinyerp.com>2012-08-17 11:50:19 +0530
committerJigar Amin - OpenERP <jam@tinyerp.com>2012-08-17 11:50:19 +0530
commit02d32cd6cfa94304b790f680f2d7ebeee51b71f4 (patch)
tree9820a325b375b30d33a7d973242563fafe89a762 /addons/web/static/src/js/test_support.js
parent1b5259b3e374a8f9c385d18706aadbdf0a2403df (diff)
parent281877d27470826b8b4925aaa1e79d14c95f963f (diff)
[MERGE] lp:openerp-web
bzr revid: jam@tinyerp.com-20120817062019-k2i3ut3snkoot3x1
Diffstat (limited to 'addons/web/static/src/js/test_support.js')
-rw-r--r--addons/web/static/src/js/test_support.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/web/static/src/js/test_support.js b/addons/web/static/src/js/test_support.js
index d46366326b7..314a12c91c6 100644
--- a/addons/web/static/src/js/test_support.js
+++ b/addons/web/static/src/js/test_support.js
@@ -1,12 +1,12 @@
openerp.test_support = {
- setup_connection: function (connection) {
+ setup_session: function (session) {
var origin = location.protocol+"//"+location.host;
- _.extend(connection, {
+ _.extend(session, {
origin: origin,
prefix: origin,
server: origin, // keep chs happy
//openerp.web.qweb.default_dict['_s'] = this.origin;
- rpc_function: connection.rpc_json,
+ rpc_function: session.rpc_json,
session_id: false,
uid: false,
username: false,
@@ -22,7 +22,7 @@ openerp.test_support = {
shortcuts: [],
active_id: null
});
- return connection.session_reload();
+ return session.session_reload();
},
module: function (title, tested_core, nonliterals) {
var conf = QUnit.config.openerp = {};
@@ -31,10 +31,10 @@ openerp.test_support = {
QUnit.stop();
var oe = conf.openerp = window.openerp.init();
window.openerp.web[tested_core](oe);
- var done = openerp.test_support.setup_connection(oe.connection);
+ var done = openerp.test_support.setup_session(oe.session);
if (nonliterals) {
done = done.pipe(function () {
- return oe.connection.rpc('/tests/add_nonliterals', {
+ return oe.session.rpc('/tests/add_nonliterals', {
domains: nonliterals.domains || [],
contexts: nonliterals.contexts || []
}).then(function (r) {