[MERGE] forward port branch saas-17 up to 877e7098719

1 files changed, 27 insertions, 1 deletions

diff --git a/addons/web/static/tests/fields/field_utils_tests.js b/addons/web/static/tests/fields/field_utils_tests.js
index a49197f6e65..a0284798553 100644
--- a/addons/web/static/tests/fields/field_utils_tests.js
+++ b/addons/web/static/tests/fields/field_utils_tests.js
@@ -4,6 +4,7 @@ odoo.define('web.field_utils_tests', function (require) {
 var core = require('web.core');
 var session = require('web.session');
 var fieldUtils = require('web.field_utils');
+var testUtils = require('web.test_utils');
 
 QUnit.module('fields', {}, function () {
 
@@ -59,10 +60,35 @@ QUnit.test("format_datetime", function (assert) {
 
     var date_string = "2009-05-04 12:34:23";
     var date = fieldUtils.parse.datetime(date_string, {}, {timezone: false});
-    var str = fieldUtils.format.datetime(date, {timezone: false});
+    var str = fieldUtils.format.datetime(date, {}, {timezone: false});
     assert.strictEqual(str, moment(date).format("MM/DD/YYYY HH:mm:ss"));
 });
 
+QUnit.test("format_datetime (with different timezone offset)", function (assert) {
+    assert.expect(2);
+
+    // mock the date format to avoid issues due to localisation
+    var dateFormat = core._t.database.parameters.date_format;
+    core._t.database.parameters.date_format = '%m/%d/%Y';
+    session.getTZOffset = function (date) {
+        // simulate daylight saving time
+        var startDate = new Date(2017, 2, 26);
+        var endDate   = new Date(2017, 9, 29);
+        if (startDate < date && date < endDate) {
+            return 120; // UTC+2
+        } else {
+            return 60; // UTC+1
+        }
+    };
+
+    var str = fieldUtils.format.datetime(moment.utc('2017-01-01T10:00:00Z'));
+    assert.strictEqual(str, '01/01/2017 11:00:00');
+    str = fieldUtils.format.datetime(moment.utc('2017-06-01T10:00:00Z'));
+    assert.strictEqual(str, '06/01/2017 12:00:00');
+
+    core._t.database.parameters.date_format = dateFormat;
+});
+
 QUnit.test("format_many2one", function (assert) {
     assert.expect(2);