Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 10 deletions

diff --git a/spec/frontend/deploy_freeze/mock_data.js b/spec/frontend/deploy_freeze/mock_data.js
index 56230388cda..cf269f9d8c0 100644
--- a/spec/frontend/deploy_freeze/mock_data.js
+++ b/spec/frontend/deploy_freeze/mock_data.js
@@ -9,7 +9,7 @@ export const mockFreezePeriods = [
     id: 3,
     freeze_start: '5 4 * * *',
     freeze_end: '5 9 * 8 *',
-    cron_timezone: 'Eastern Time (US & Canada)',
+    cron_timezone: 'America/New_York',
     created_at: '2020-07-10T05:10:35.122Z',
     updated_at: '2020-07-10T05:10:35.122Z',
   },
@@ -17,7 +17,7 @@ export const mockFreezePeriods = [
     id: 8,
     freeze_start: '0 12 * * 1-5',
     freeze_end: '0 1 5 * *',
-    cron_timezone: 'Mountain Time (US & Canada)',
+    cron_timezone: 'Etc/UTC',
     created_at: '2020-07-10T19:27:57.378Z',
     updated_at: '2020-07-10T19:27:57.378Z',
   },
@@ -25,7 +25,7 @@ export const mockFreezePeriods = [
     id: 9,
     freeze_start: '0 12 * * 1-5',
     freeze_end: '0 16 * * 6',
-    cron_timezone: 'Central Time (US & Canada)',
+    cron_timezone: 'Europe/Berlin',
     created_at: '2020-07-10T19:29:15.240Z',
     updated_at: '2020-07-10T19:29:15.240Z',
   },
diff --git a/spec/frontend/deploy_freeze/store/actions_spec.js b/spec/frontend/deploy_freeze/store/actions_spec.js
index ad33dfee39f..5c0d6b404c8 100644
--- a/spec/frontend/deploy_freeze/store/actions_spec.js
+++ b/spec/frontend/deploy_freeze/store/actions_spec.js
@@ -95,11 +95,11 @@ describe('deploy freeze store actions', () => {
         actions.fetchFreezePeriods,
         {},
         state,
-        [],
         [
-          { type: 'requestFreezePeriods' },
-          { type: 'receiveFreezePeriodsSuccess', payload: mockFreezePeriods },
+          { type: types.REQUEST_FREEZE_PERIODS },
+          { type: types.RECEIVE_FREEZE_PERIODS_SUCCESS, payload: mockFreezePeriods },
         ],
+        [],
       );
     });
 
@@ -110,8 +110,8 @@ describe('deploy freeze store actions', () => {
         actions.fetchFreezePeriods,
         {},
         state,
+        [{ type: types.REQUEST_FREEZE_PERIODS }],
         [],
-        [{ type: 'requestFreezePeriods' }],
         () =>
           expect(createFlash).toHaveBeenCalledWith(
             'There was an error fetching the deploy freezes.',
diff --git a/spec/frontend/deploy_freeze/store/mutations_spec.js b/spec/frontend/deploy_freeze/store/mutations_spec.js
index 85ed0a84156..d17c947bb5b 100644
--- a/spec/frontend/deploy_freeze/store/mutations_spec.js
+++ b/spec/frontend/deploy_freeze/store/mutations_spec.js
@@ -2,8 +2,9 @@ import state from '~/deploy_freeze/store/state';
 import mutations from '~/deploy_freeze/store/mutations';
 import * as types from '~/deploy_freeze/store/mutation_types';
 import { mockFreezePeriods, mockTimezoneData } from '../mock_data';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
-describe('CI variable list mutations', () => {
+describe('Deploy freeze mutations', () => {
   let stateCopy;
   beforeEach(() => {
     stateCopy = state({
@@ -24,10 +25,17 @@ describe('CI variable list mutations', () => {
   });
 
   describe('RECEIVE_FREEZE_PERIODS_SUCCESS', () => {
-    it('should set environments', () => {
+    it('should set freeze periods and format timezones from identifiers to names', () => {
+      const timezoneNames = ['Eastern Time (US & Canada)', 'UTC', 'Berlin'];
+
       mutations[types.RECEIVE_FREEZE_PERIODS_SUCCESS](stateCopy, mockFreezePeriods);
 
-      expect(stateCopy.freezePeriods).toEqual(mockFreezePeriods);
+      const expectedFreezePeriods = mockFreezePeriods.map((freezePeriod, index) => ({
+        ...convertObjectPropsToCamelCase(freezePeriod),
+        cronTimezone: timezoneNames[index],
+      }));
+
+      expect(stateCopy.freezePeriods).toMatchObject(expectedFreezePeriods);
     });
   });