diff options
| author | Cedric Snauwaert <csn@openerp.com> | 2014-09-11 15:02:12 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-11-05 15:27:59 +0100 |
| commit | a8d9743c0cc2dda11fdcb72e38b209cd74f102b0 (patch) | |
| tree | a8a8c56adea81f8dc976f87946b65a8ff0cb9378 /addons/web/static/test | |
| parent | ef886aed2f4c7d9b78123d1cd980a899bf6b20ea (diff) | |
[FIX] web: fix tests on date parsing
Diffstat (limited to 'addons/web/static/test')
| -rw-r--r-- | addons/web/static/test/formats.js | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/addons/web/static/test/formats.js b/addons/web/static/test/formats.js index 5549e6e1772..296bbd4b8bb 100644 --- a/addons/web/static/test/formats.js +++ b/addons/web/static/test/formats.js @@ -4,17 +4,17 @@ openerp.testing.section('web-formats', { test("format_datetime", function (instance) { var date = instance.web.str_to_datetime("2009-05-04 12:34:23"); var str = instance.web.format_value(date, {type:"datetime"}); - equal(str, new moment(date).format("MM/DD/YYYY HH:mm:ss")); + equal(str, (new moment(date)).format("MM/DD/YYYY HH:mm:ss")); }); test("format_date", function (instance) { var date = instance.web.str_to_datetime("2009-05-04 12:34:23"); var str = instance.web.format_value(date, {type:"date"}); - equal(str, new moment(date).format("MM/DD/YYYY")); + equal(str, (new moment(date)).format("MM/DD/YYYY")); }); test("format_time", function (instance) { var date = instance.web.str_to_datetime("2009-05-04 12:34:23"); var str = instance.web.format_value(date, {type:"time"}); - equal(str, new moment(date).format("HH:mm:ss")); + equal(str, (new moment(date)).format("HH:mm:ss")); }); test("format_float_time", function (instance) { strictEqual( @@ -173,14 +173,16 @@ openerp.testing.section('web-formats', { 'Mon, 2009 May 04'); strictEqual(instance.web.parse_value('Mon, 2009 May 04', {type: 'date'}), '2009-05-04'); + instance.web._t.database.parameters.date_format = '%m/%d/%Y'; }); test('extended ES date format', function (instance) { - instance.web._t.database.parameters.date_format = '%a, %Y.eko %bren %da'; - var date = instance.web.str_to_date("2009-05-04"); - strictEqual(instance.web.format_value(date, {type:"date"}), - 'Mon, 2009. May 04'); - strictEqual(instance.web.parse_value('Mon, 2009. May 04', {type: 'date'}), - '2009-05-04'); - }); + instance.web._t.database.parameters.date_format = '%a, %Y.eko %b ren %da'; + var date = instance.web.str_to_date("2009-05-04"); + strictEqual(instance.web.format_value(date, {type:"date"}), + 'Mon, 2009.eko May ren 04'); + strictEqual(instance.web.parse_value('Mon, 2009.eko May ren 04', {type: 'date'}), + '2009-05-04'); + instance.web._t.database.parameters.date_format = '%m/%d/%Y'; + }); }); |
