Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 17 deletions

diff --git a/spec/frontend/monitoring/store/actions_spec.js b/spec/frontend/monitoring/store/actions_spec.js
index 5af13c0987a..0e28b70a760 100644
--- a/spec/frontend/monitoring/store/actions_spec.js
+++ b/spec/frontend/monitoring/store/actions_spec.js
@@ -63,11 +63,17 @@ describe('Monitoring store actions', () => {
   let store;
   let state;
 
+  let dispatch;
+  let commit;
+
   beforeEach(() => {
     store = createStore({ getters });
     state = store.state.monitoringDashboard;
     mock = new MockAdapter(axios);
 
+    commit = jest.fn();
+    dispatch = jest.fn();
+
     jest.spyOn(commonUtils, 'backOff').mockImplementation(callback => {
       const q = new Promise((resolve, reject) => {
         const stop = arg => (arg instanceof Error ? reject(arg) : resolve(arg));
@@ -200,12 +206,8 @@ describe('Monitoring store actions', () => {
   // Metrics dashboard
 
   describe('fetchDashboard', () => {
-    let dispatch;
-    let commit;
     const response = metricsDashboardResponse;
     beforeEach(() => {
-      dispatch = jest.fn();
-      commit = jest.fn();
       state.dashboardEndpoint = '/dashboard';
     });
 
@@ -292,14 +294,6 @@ describe('Monitoring store actions', () => {
   });
 
   describe('receiveMetricsDashboardSuccess', () => {
-    let commit;
-    let dispatch;
-
-    beforeEach(() => {
-      commit = jest.fn();
-      dispatch = jest.fn();
-    });
-
     it('stores groups', () => {
       const response = metricsDashboardResponse;
       receiveMetricsDashboardSuccess({ state, commit, dispatch }, { response });
@@ -359,13 +353,8 @@ describe('Monitoring store actions', () => {
   // Metrics
 
   describe('fetchDashboardData', () => {
-    let commit;
-    let dispatch;
-
     beforeEach(() => {
       jest.spyOn(Tracking, 'event');
-      commit = jest.fn();
-      dispatch = jest.fn();
 
       state.timeRange = defaultTimeRange;
     });