Merge branch 'fix/moment' of github.com:jbudz/kibana into fix/moment

elastic · Mar 3, 2020 · 4d200d1 · 4d200d1
2 parents 4bc4111 + c7e412d
commit 4d200d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/core/public/integrations/moment/moment_service.test.ts b/src/core/public/integrations/moment/moment_service.test.ts
@@ -49,10 +49,8 @@ describe('MomentService', () => {
 
   it('does not set unknkown zone', async () => {
     const tz$ = new BehaviorSubject('timezone/undefined');
-    const dow$ = new BehaviorSubject('dow1');
-
     const uiSettings = uiSettingsServiceMock.createSetupContract();
-    uiSettings.get$.mockReturnValueOnce(tz$).mockReturnValueOnce(dow$);
+    uiSettings.get$.mockReturnValueOnce(tz$);
 
     service.start({ uiSettings });
     await flushPromises();
@@ -61,10 +59,8 @@ describe('MomentService', () => {
 
   it('sets timezone when a zone is defined', async () => {
     const tz$ = new BehaviorSubject('tz3');
-    const dow$ = new BehaviorSubject('dow1');
-
     const uiSettings = uiSettingsServiceMock.createSetupContract();
-    uiSettings.get$.mockReturnValueOnce(tz$).mockReturnValueOnce(dow$);
+    uiSettings.get$.mockReturnValueOnce(tz$);
 
     service.start({ uiSettings });
     await flushPromises();

diff --git a/src/core/public/integrations/moment/moment_service.ts b/src/core/public/integrations/moment/moment_service.ts
@@ -19,7 +19,6 @@
 
 import moment from 'moment-timezone';
 import { merge, Subscription } from 'rxjs';
-import { get } from 'lodash';
 
 import { tap } from 'rxjs/operators';
 import { IUiSettingsClient } from '../../ui_settings';
@@ -37,8 +36,8 @@ export class MomentService implements CoreService {
 
   public async start({ uiSettings }: StartDeps) {
     const setDefaultTimezone = (tz: string) => {
-      const zone: string | undefined = get(moment.tz.zone(tz), 'name');
-      if (zone) moment.tz.setDefault(zone);
+      const zone = moment.tz.zone(tz);
+      if (zone) moment.tz.setDefault(zone.name);
     };
     const setStartDayOfWeek = (day: string) => {
       const dow = moment.weekdays().indexOf(day);