From 65a829b64d70380cf774c60d9848ed3d776cb45f Mon Sep 17 00:00:00 2001 From: Alexander Zobnin Date: Wed, 29 Mar 2017 13:41:19 +0300 Subject: [PATCH] heatmap tests: fix timezone-dependent test error --- .../panel/heatmap/specs/renderer_specs.ts | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/public/app/plugins/panel/heatmap/specs/renderer_specs.ts b/public/app/plugins/panel/heatmap/specs/renderer_specs.ts index d94f3128339..1ba1bec9b83 100644 --- a/public/app/plugins/panel/heatmap/specs/renderer_specs.ts +++ b/public/app/plugins/panel/heatmap/specs/renderer_specs.ts @@ -74,11 +74,11 @@ describe('grafanaHeatmap', function () { renderingCompleted: sinon.spy(), hiddenSeries: {}, dashboard: { - getTimezone: sinon.stub().returns('browser') + getTimezone: sinon.stub().returns('utc') }, range: { - from: moment(1422774000000), - to: moment(1422774100000), + from: moment.utc("01 Mar 2017 10:00:00"), + to: moment.utc("01 Mar 2017 11:00:00"), }, }; @@ -148,7 +148,14 @@ describe('grafanaHeatmap', function () { it('should draw correct X axis', function () { var xTicks = getTicks(ctx.element, ".axis-x"); - expect(xTicks).to.eql(['10:00:00', '10:00:15', '10:00:30', '10:00:45', '10:01:00', '10:01:15', '10:01:30']); + let expectedTicks = [ + formatLocalTime("01 Mar 2017 10:00:00"), + formatLocalTime("01 Mar 2017 10:15:00"), + formatLocalTime("01 Mar 2017 10:30:00"), + formatLocalTime("01 Mar 2017 10:45:00"), + formatLocalTime("01 Mar 2017 11:00:00") + ]; + expect(xTicks).to.eql(expectedTicks); }); }); @@ -249,3 +256,8 @@ function getTicks(element, axisSelector) { return this.textContent; }).get(); } + +function formatLocalTime(timeStr) { + let format = "HH:mm"; + return moment.utc(timeStr).local().format(format); +}