[MERGE] merged with main web

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

3 files changed, 43 insertions, 61 deletions

diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js
index 840ad051aca..13ac0f3f3b7 100644
--- a/addons/web/static/test/evals.js
+++ b/addons/web/static/test/evals.js
@@ -265,6 +265,41 @@ openerp.testing.section('eval.types', {
                     instance.web.pyeval.context()),
             "2012-02-14 23:59:59");
     });
+    test('datetime.tojson', function (instance) {
+        var result = py.eval(
+            'datetime.datetime(2012, 2, 15, 1, 7, 31)',
+            instance.web.pyeval.context());
+        ok(result instanceof Date);
+        equal(result.getFullYear(), 2012);
+        equal(result.getMonth(), 1);
+        equal(result.getDate(), 15);
+        equal(result.getHours(), 1);
+        equal(result.getMinutes(), 7);
+        equal(result.getSeconds(), 31);
+    });
+    test('datetime.combine', function (instance) {
+        var result = py.eval(
+            'datetime.datetime.combine(datetime.date(2012, 2, 15),' +
+            '                          datetime.time(1, 7, 13))' +
+            '   .strftime("%Y-%m-%d %H:%M:%S")',
+            instance.web.pyeval.context());
+        equal(result, "2012-02-15 01:07:13");
+
+        result = py.eval(
+            'datetime.datetime.combine(datetime.date(2012, 2, 15),' +
+            '                          datetime.time())' +
+            '   .strftime("%Y-%m-%d %H:%M:%S")',
+            instance.web.pyeval.context());
+        equal(result, '2012-02-15 00:00:00');
+    });
+    test('datetime.replace', function (instance) {
+        var result = py.eval(
+            'datetime.datetime(2012, 2, 15, 1, 7, 13)' +
+            '   .replace(hour=0, minute=0, second=0)' +
+            '   .strftime("%Y-%m-%d %H:%M:%S")',
+            instance.web.pyeval.context());
+        equal(result, "2012-02-15 00:00:00");
+    });
 });
 openerp.testing.section('eval.edc', {
     dependencies: ['web.data'],
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");
-        });
-    });
-});
-
 })();
diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js
index c9588c77d0e..9874795e1c9 100644
--- a/addons/web/static/test/search.js
+++ b/addons/web/static/test/search.js
@@ -425,7 +425,7 @@ openerp.testing.section('search.completions', {
                     "should have the right facet in the query");
             });
     });
-    test('facet selection: new value existing facet', {asserts: 3}, function (instance, $s) {
+    test('facet selection: new value existing facet', {asserts: 8}, function (instance, $s) {
         var field = {
             get_domain: openerp.testing.noop,
             get_context: openerp.testing.noop,
@@ -451,8 +451,14 @@ openerp.testing.section('search.completions', {
                     {item: completion});
                 equal(view.query.length, 1, "should still have only one facet");
                 var facet = view.query.at(0);
+                var values = facet.get('values');
+                equal(values.length, 2, 'should have two values');
+                equal(values[0].label, 'previous');
+                equal(values[0].value, 41);
+                equal(values[1].label, 'dummy');
+                equal(values[1].value, 42);
                 deepEqual(
-                    facet.get('values'),
+                    values,
                     [{label: 'previous', value: 41}, {label: 'dummy', value: 42}],
                     "should have added selected value to old one");
             });