Browse Source

chore: Bump moment to align moment requirements (#11143)

Evan Purkhiser 6 years ago
parent
commit
7427a485e2

+ 2 - 2
package.json

@@ -52,8 +52,8 @@
     "marked": "0.3.17",
     "mobx": "^3.2.2",
     "mobx-react": "^4.2.2",
-    "moment": "2.22.0",
-    "moment-timezone": "0.5.4",
+    "moment": "2.23.0",
+    "moment-timezone": "0.5.23",
     "node-libs-browser": "0.5.3",
     "papaparse": "^4.6.0",
     "parseurl": "^1.3.2",

+ 4 - 0
tests/js/spec/components/organizations/timeRangeSelector/dateRange.spec.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import {mount} from 'enzyme';
 import MockDate from 'mockdate';
 
+import ConfigStore from 'app/stores/configStore';
 import DateRange from 'app/components/organizations/timeRangeSelector/dateRange';
 
 // 2017-10-14T02:38:00.000Z
@@ -38,6 +39,9 @@ describe('DateRange', function() {
 
   beforeAll(function() {
     MockDate.set(new Date('2017-10-16T23:41:20.000Z'));
+    ConfigStore.loadInitialData({
+      user: {options: {timezone: 'America/New_York'}},
+    });
   });
 
   afterAll(function() {

+ 5 - 1
tests/js/spec/components/organizations/timeRangeSelector/index.spec.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
-
 import {mount} from 'enzyme';
+
+import ConfigStore from 'app/stores/configStore';
 import TimeRangeSelector from 'app/components/organizations/timeRangeSelector';
 
 describe('TimeRangeSelector', function() {
@@ -15,6 +16,9 @@ describe('TimeRangeSelector', function() {
     );
 
   beforeEach(function() {
+    ConfigStore.loadInitialData({
+      user: {options: {timezone: 'America/New_York'}},
+    });
     onChange.mockReset();
   });
 

+ 5 - 0
tests/js/spec/views/organizationDiscover/discover.spec.jsx

@@ -2,6 +2,7 @@ import {browserHistory} from 'react-router';
 import React from 'react';
 
 import {mount} from 'enzyme';
+import ConfigStore from 'app/stores/configStore';
 import Discover from 'app/views/organizationDiscover/discover';
 import GlobalSelectionStore from 'app/stores/globalSelectionStore';
 import createQueryBuilder from 'app/views/organizationDiscover/queryBuilder';
@@ -609,6 +610,10 @@ describe('Discover', function() {
     });
 
     it('switches between UTC and local dates', async function() {
+      ConfigStore.loadInitialData({
+        user: {options: {timezone: 'America/New_York'}},
+      });
+
       // Select absolute date
       wrapper.find('TimeRangeSelector HeaderItem').simulate('click');
       wrapper.find('SelectorItem[value="absolute"]').simulate('click');

+ 11 - 16
yarn.lock

@@ -8152,22 +8152,17 @@ mockdate@2.0.2:
   resolved "https://registry.yarnpkg.com/mockdate/-/mockdate-2.0.2.tgz#5ae0c0eaf8fe23e009cd01f9889b42c4f634af12"
   integrity sha1-WuDA6vj+I+AJzQH5iJtCxPY0rxI=
 
-moment-timezone@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.4.tgz#b6188b8f08557ea9ffb0d42899f5b171e1858e93"
-  integrity sha1-thiLjwhVfqn/sNQomfWxceGFjpM=
-  dependencies:
-    moment ">= 2.6.0"
-
-moment@2.22.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
-  integrity sha512-1muXCh8jb1N/gHRbn9VDUBr0GYb8A/aVcHlII9QSB68a50spqEVLIGN6KVmCOnSvJrUhC0edGgKU5ofnGXdYdg==
-
-"moment@>= 2.6.0":
-  version "2.10.6"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.10.6.tgz#6cb21967c79cba7b0ca5e66644f173662b3efa77"
-  integrity sha1-bLIZZ8ecunsMpeZmRPFzZis++nc=
+moment-timezone@0.5.23:
+  version "0.5.23"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.23.tgz#7cbb00db2c14c71b19303cb47b0fb0a6d8651463"
+  integrity sha512-WHFH85DkCfiNMDX5D3X7hpNH3/PUhjTGcD0U1SgfBGZxJ3qUmJh5FdvaFjcClxOvB3rzdfj4oRffbI38jEnC1w==
+  dependencies:
+    moment ">= 2.9.0"
+
+moment@2.23.0, "moment@>= 2.9.0":
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225"
+  integrity sha512-3IE39bHVqFbWWaPOMHZF98Q9c3LDKGTmypMiTM2QygGXXElkFWIH7GxfmlwmY2vwa+wmNsoYZmG2iusf1ZjJoA==
 
 moment@^2.21.0:
   version "2.22.2"