From 0b082e87689a7fc32c495248129a69bd0ef28535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@grafana.com>
Date: Mon, 10 Feb 2020 13:15:30 +0100
Subject: [PATCH] Chore: Fixes non utc tests (#22063)

---
 .../LokiExploreQueryEditor.test.tsx           | 20 +++++++++----------
 .../PromExploreQueryEditor.test.tsx           | 20 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx
index 42d4e82946e..a6f45ee3acf 100644
--- a/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { shallow, mount } from 'enzyme';
+import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import LokiExploreQueryEditor from './LokiExploreQueryEditor';
 import { LokiExploreExtraField } from './LokiExploreExtraField';
 import { LokiDatasource } from '../datasource';
 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 LokiLanguageProvider from '../language_provider';
 
@@ -24,11 +24,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
       interval: '1s',
       panelId: 1,
       range: {
-        from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-        to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+        from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+        to: toUtc('2020-01-02', 'YYYY-MM-DD'),
         raw: {
-          from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-          to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+          from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+          to: toUtc('2020-01-02', 'YYYY-MM-DD'),
         },
       },
       scopedVars: {},
@@ -38,11 +38,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
       startTime: 0,
     },
     timeRange: {
-      from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-      to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+      from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+      to: toUtc('2020-01-02', 'YYYY-MM-DD'),
       raw: {
-        from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-        to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+        from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+        to: toUtc('2020-01-02', 'YYYY-MM-DD'),
       },
     },
   };
diff --git a/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx b/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx
index e6110541b4a..1eeacabdd21 100644
--- a/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromExploreQueryEditor.test.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
-import { shallow, mount } from 'enzyme';
+import { mount, shallow } from 'enzyme';
 import { act } from 'react-dom/test-utils';
 import PromExploreQueryEditor from './PromExploreQueryEditor';
 import { PromExploreExtraField } from './PromExploreExtraField';
 import { PrometheusDatasource } from '../datasource';
 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 datasourceMock: unknown = {};
@@ -22,11 +22,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
       interval: '1s',
       panelId: 1,
       range: {
-        from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-        to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+        from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+        to: toUtc('2020-01-02', 'YYYY-MM-DD'),
         raw: {
-          from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-          to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+          from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+          to: toUtc('2020-01-02', 'YYYY-MM-DD'),
         },
       },
       scopedVars: {},
@@ -36,11 +36,11 @@ const setup = (renderMethod: any, propOverrides?: object) => {
       startTime: 0,
     },
     timeRange: {
-      from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-      to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+      from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+      to: toUtc('2020-01-02', 'YYYY-MM-DD'),
       raw: {
-        from: dateTime('2020-01-01', 'YYYY-MM-DD'),
-        to: dateTime('2020-01-02', 'YYYY-MM-DD'),
+        from: toUtc('2020-01-01', 'YYYY-MM-DD'),
+        to: toUtc('2020-01-02', 'YYYY-MM-DD'),
       },
     },
   };