summaryrefslogtreecommitdiff
path: root/addons/web/static/test
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-03-04 15:16:10 +0100
committerChristophe Simonis <chs@odoo.com>2015-03-04 15:16:10 +0100
commitbc2fd0515b2ee0dafe05d95a76eccb99b35a418c (patch)
tree0cf1fdbaa92b178ce51db635242e611e7d62173e /addons/web/static/test
parent94c33caa784e3017285b55dc68c6726ed50b5f94 (diff)
parent017f346dd36e421877b2a7dfb94b5f805c435238 (diff)
[MERGE] forward port of branch 8.0 up to 017f346
Diffstat (limited to 'addons/web/static/test')
-rw-r--r--addons/web/static/test/evals.js16
1 files changed, 14 insertions, 2 deletions
diff --git a/addons/web/static/test/evals.js b/addons/web/static/test/evals.js
index 13ac0f3f3b7..a85f973e874 100644
--- a/addons/web/static/test/evals.js
+++ b/addons/web/static/test/evals.js
@@ -261,9 +261,21 @@ openerp.testing.section('eval.types', {
});
test('relastivedelta', function (instance) {
strictEqual(
- py.eval("(datetime.date(2012, 2, 15) + relativedelta(days=-1)).strftime('%Y-%m-%d 23:59:59')",
+ py.eval("(datetime.date(2012, 2, 15) + relativedelta(days=1)).strftime('%Y-%m-%d')",
instance.web.pyeval.context()),
- "2012-02-14 23:59:59");
+ "2012-02-16");
+ strictEqual(
+ py.eval("(datetime.date(2012, 2, 15) + relativedelta(days=-1)).strftime('%Y-%m-%d')",
+ instance.web.pyeval.context()),
+ "2012-02-14");
+ strictEqual(
+ py.eval("(datetime.date(2012, 2, 1) + relativedelta(days=-1)).strftime('%Y-%m-%d')",
+ instance.web.pyeval.context()),
+ '2012-01-31');
+ strictEqual(
+ py.eval("(datetime.date(2015,2,5)+relativedelta(days=-6,weekday=0)).strftime('%Y-%m-%d')",
+ instance.web.pyeval.context()),
+ '2015-02-02');
});
test('datetime.tojson', function (instance) {
var result = py.eval(