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

Chore: Fixes non utc tests (#22063)

Browse Source
This commit is contained in:
Hugo Häggmark 2020-02-10 13:15:30 +01:00 committed by GitHub
parent bf4c11d0d4
commit 0b082e8768
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx
View File

@ -1,11 +1,11 @@
import React from 'react'; import React from 'react';
import { shallow, mount } from 'enzyme'; import { mount, shallow } from 'enzyme';
import { act } from 'react-dom/test-utils'; import { act } from 'react-dom/test-utils';
import LokiExploreQueryEditor from './LokiExploreQueryEditor'; import LokiExploreQueryEditor from './LokiExploreQueryEditor';
import { LokiExploreExtraField } from './LokiExploreExtraField'; import { LokiExploreExtraField } from './LokiExploreExtraField';
import { LokiDatasource } from '../datasource'; import { LokiDatasource } from '../datasource';
import { LokiQuery } from '../types'; import { LokiQuery } from '../types';
import { ExploreMode, PanelData, LoadingState, dateTime } from '@grafana/data'; import { ExploreMode, LoadingState, PanelData, toUtc } from '@grafana/data';
import { makeMockLokiDatasource } from '../mocks'; import { makeMockLokiDatasource } from '../mocks';
import LokiLanguageProvider from '../language_provider'; import LokiLanguageProvider from '../language_provider';
@ -24,11 +24,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
interval: '1s', interval: '1s',
panelId: 1, panelId: 1,
range: { range: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
raw: { raw: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
}, },
}, },
scopedVars: {}, scopedVars: {},
@ -38,11 +38,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
startTime: 0, startTime: 0,
}, },
timeRange: { timeRange: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
raw: { raw: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
}, },
}, },
}; };

20
public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx
View File

@ -1,11 +1,11 @@
import React from 'react'; import React from 'react';
import { shallow, mount } from 'enzyme'; import { mount, shallow } from 'enzyme';
import { act } from 'react-dom/test-utils'; import { act } from 'react-dom/test-utils';
import PromExploreQueryEditor from './PromExploreQueryEditor'; import PromExploreQueryEditor from './PromExploreQueryEditor';
import { PromExploreExtraField } from './PromExploreExtraField'; import { PromExploreExtraField } from './PromExploreExtraField';
import { PrometheusDatasource } from '../datasource'; import { PrometheusDatasource } from '../datasource';
import { PromQuery } from '../types'; import { PromQuery } from '../types';
import { PanelData, LoadingState, dateTime } from '@grafana/data'; import { LoadingState, PanelData, toUtc } from '@grafana/data';
const setup = (renderMethod: any, propOverrides?: object) => { const setup = (renderMethod: any, propOverrides?: object) => {
const datasourceMock: unknown = {}; const datasourceMock: unknown = {};
@ -22,11 +22,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
interval: '1s', interval: '1s',
panelId: 1, panelId: 1,
range: { range: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
raw: { raw: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
}, },
}, },
scopedVars: {}, scopedVars: {},
@ -36,11 +36,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
startTime: 0, startTime: 0,
}, },
timeRange: { timeRange: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
raw: { raw: {
from: dateTime('2020-01-01', 'YYYY-MM-DD'), from: toUtc('2020-01-01', 'YYYY-MM-DD'),
to: dateTime('2020-01-02', 'YYYY-MM-DD'), to: toUtc('2020-01-02', 'YYYY-MM-DD'),
}, },
}, },
}; };