[MERGE] merged with main web

bzr revid: bde@tinyerp.com-20140304053849-wpvxs1ojl5jyjokt

1 files changed, 0 insertions, 59 deletions

diff --git a/addons/web/static/test/jsonrpc.js b/addons/web/static/test/jsonrpc.js
index 46b7ceeac6e..3b7140bacff 100644
--- a/addons/web/static/test/jsonrpc.js
+++ b/addons/web/static/test/jsonrpc.js
@@ -149,63 +149,4 @@ function (test) {
     });*/
 });
 
-var login = "admin";
-var password = "admin";
-
-ropenerp.testing.section('jsonrpc-auth', {
-    rpc: "rpc",
-},
-function (test) {
-    test('basic-auth', {asserts: 3}, function () {
-        var db = ropenerp.session.db;
-        var session = new openerp.Session(null, null, {override_session: true});
-        equal(session.uid, undefined, "uid is expected to be undefined");
-        return session.session_authenticate(db, login, password).then(function() {
-            equal(session.uid, 1, "Admin's uid must be 1");
-            return session.rpc("/web/dataset/call_kw", {
-                model: "res.users",
-                method: "read",
-                args: [1, ["login"]],
-                kwargs: {},
-            }).then(function(result) {
-                equal(result.login, "admin", "Admin's name must be 'admin'");
-            });
-        });
-    });
-    test('share-sessions', {asserts: 6}, function () {
-        var db = ropenerp.session.db;
-        var session = new openerp.Session(null, null, {override_session: true});
-        var session2;
-        return session.session_authenticate(db, login, password).then(function() {
-            equal(session.uid, 1, "Admin's uid must be 1");
-            session2 = new openerp.Session(null, null, {session_id: session.session_id});
-            equal(session2.uid, undefined, "uid should be undefined");
-            equal(session2.override_session, true, "overwrite_session should be true");
-            console.log("session_id", session.session_id);
-            return session2.session_reload();
-        }).then(function() {
-            equal(session2.uid, session.uid);
-            equal(session2.uid, 1);
-            return session2.rpc("/web/dataset/call_kw", {
-                model: "res.users",
-                method: "read",
-                args: [1, ["login"]],
-                kwargs: {},
-            }).then(function(result) {
-                equal(result.login, "admin", "Admin's name must be 'admin'");
-            });
-        });
-    });
-    test('models', {asserts: 2}, function () {
-        var db = ropenerp.session.db;
-        var session = new openerp.Session(null, null, {override_session: true});
-        return session.session_authenticate(db, login, password).then(function() {
-            return session.model("res.users").call("search_read", {fields: ["login"], domain: [["id", "=", 1]]});
-        }).then(function(result) {
-            equal(result.length, 1, "Must have one result");
-            equal(result[0].login, "admin", "Must have admin's login");
-        });
-    });
-});
-
 })();