IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix date test (#9811)

Browse Source
This commit is contained in:
Mitsuhiro Tanda
2017-11-08 19:01:19 +09:00
committed by Torkel Ödegaard
parent 799aaf720a
commit e46814ba05
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/specs/datemath.jest.ts
View File

@@ -48,7 +48,7 @@ describe("DateMath", () => {
it("now/d on a utc dashboard should be start of the current day in UTC time", () => { it("now/d on a utc dashboard should be start of the current day in UTC time", () => {
var today = new Date(); var today = new Date();
var expected = new Date(Date.UTC(today.getFullYear(), today.getMonth(), today.getDate(), 0, 0, 0, 0)); var expected = new Date(Date.UTC(today.getUTCFullYear(), today.getUTCMonth(), today.getUTCDate(), 0, 0, 0, 0));
var startOfDay = dateMath.parse('now/d', false, 'utc').valueOf(); var startOfDay = dateMath.parse('now/d', false, 'utc').valueOf();
expect(startOfDay).toBe(expected.getTime()); expect(startOfDay).toBe(expected.getTime());

2
public/app/core/specs/kbn.jest.ts
View File

@@ -114,7 +114,7 @@ describe('date time formats', function() {
it('should format as US date', function() { it('should format as US date', function() {
var str = kbn.valueFormats.dateTimeAsUS(1505634997920, 1); var str = kbn.valueFormats.dateTimeAsUS(1505634997920, 1);
expect(str).toBe(moment(1505634997920).format('MM/DD/YYYY H:mm:ss a')); expect(str).toBe(moment(1505634997920).format('MM/DD/YYYY h:mm:ss a'));
}); });
it('should format as US date and skip date when today', function() { it('should format as US date and skip date when today', function() {