Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

4 files changed, 32 insertions, 105 deletions

diff --git a/spec/frontend/cycle_analytics/base_spec.js b/spec/frontend/cycle_analytics/base_spec.js
index 7b1ef71da63..ea3da86c7b2 100644
--- a/spec/frontend/cycle_analytics/base_spec.js
+++ b/spec/frontend/cycle_analytics/base_spec.js
@@ -11,7 +11,6 @@ import ValueStreamFilters from '~/cycle_analytics/components/value_stream_filter
 import { NOT_ENOUGH_DATA_ERROR } from '~/cycle_analytics/constants';
 import initState from '~/cycle_analytics/store/state';
 import {
-  permissions,
   transformedProjectStagePathData,
   selectedStage,
   issueEvents,
@@ -34,7 +33,6 @@ let wrapper;
 
 const { id: groupId, path: groupPath } = currentGroup;
 const defaultState = {
-  permissions,
   currentGroup,
   createdBefore,
   createdAfter,
@@ -240,24 +238,6 @@ describe('Value stream analytics component', () => {
     });
   });
 
-  describe('without enough permissions', () => {
-    beforeEach(() => {
-      wrapper = createComponent({
-        initialState: {
-          selectedStage,
-          permissions: {
-            ...permissions,
-            [selectedStage.id]: false,
-          },
-        },
-      });
-    });
-
-    it('renders the empty stage with `You need permission.` message', () => {
-      expect(findEmptyStageTitle()).toBe('You need permission.');
-    });
-  });
-
   describe('without a selected stage', () => {
     beforeEach(() => {
       wrapper = createComponent({
diff --git a/spec/frontend/cycle_analytics/mock_data.js b/spec/frontend/cycle_analytics/mock_data.js
index 1fe1dbbb75c..02666260cdb 100644
--- a/spec/frontend/cycle_analytics/mock_data.js
+++ b/spec/frontend/cycle_analytics/mock_data.js
@@ -101,30 +101,12 @@ export const selectedStage = {
   ...issueStage,
   value: null,
   active: false,
-  isUserAllowed: true,
   emptyStageText:
     'The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.',
 
   slug: 'issue',
 };
 
-export const stats = [issueStage, planStage, codeStage, testStage, reviewStage, stagingStage];
-
-export const permissions = {
-  issue: true,
-  plan: true,
-  code: true,
-  test: true,
-  review: true,
-  staging: true,
-};
-
-export const rawData = {
-  summary,
-  stats,
-  permissions,
-};
-
 export const convertedData = {
   summary: [
     { value: '20', title: 'New Issues' },
diff --git a/spec/frontend/cycle_analytics/store/actions_spec.js b/spec/frontend/cycle_analytics/store/actions_spec.js
index e775e941b4c..94b6de85a5c 100644
--- a/spec/frontend/cycle_analytics/store/actions_spec.js
+++ b/spec/frontend/cycle_analytics/store/actions_spec.js
@@ -153,6 +153,19 @@ describe('Project Value Stream Analytics actions', () => {
         });
       });
     });
+
+    describe('with no value stream stages available', () => {
+      it('will return SET_NO_ACCESS_ERROR', () => {
+        state = { ...state, stages: [] };
+        testAction({
+          action: actions.setInitialStage,
+          state,
+          payload: null,
+          expectedMutations: [{ type: 'SET_NO_ACCESS_ERROR' }],
+          expectedActions: [],
+        });
+      });
+    });
   });
 
   describe('updateStageTablePagination', () => {
@@ -170,46 +183,6 @@ describe('Project Value Stream Analytics actions', () => {
     });
   });
 
-  describe('fetchCycleAnalyticsData', () => {
-    beforeEach(() => {
-      state = { ...defaultState, endpoints: mockEndpoints };
-      mock = new MockAdapter(axios);
-      mock.onGet(mockRequestPath).reply(httpStatusCodes.OK);
-    });
-
-    it(`dispatches the 'setSelectedStage' and 'fetchStageData' actions`, () =>
-      testAction({
-        action: actions.fetchCycleAnalyticsData,
-        state,
-        payload: {},
-        expectedMutations: [
-          { type: 'REQUEST_CYCLE_ANALYTICS_DATA' },
-          { type: 'RECEIVE_CYCLE_ANALYTICS_DATA_SUCCESS' },
-        ],
-        expectedActions: [],
-      }));
-
-    describe('with a failing request', () => {
-      beforeEach(() => {
-        state = { endpoints: mockEndpoints };
-        mock = new MockAdapter(axios);
-        mock.onGet(mockRequestPath).reply(httpStatusCodes.BAD_REQUEST);
-      });
-
-      it(`commits the 'RECEIVE_CYCLE_ANALYTICS_DATA_ERROR' mutation`, () =>
-        testAction({
-          action: actions.fetchCycleAnalyticsData,
-          state,
-          payload: {},
-          expectedMutations: [
-            { type: 'REQUEST_CYCLE_ANALYTICS_DATA' },
-            { type: 'RECEIVE_CYCLE_ANALYTICS_DATA_ERROR' },
-          ],
-          expectedActions: [],
-        }));
-    });
-  });
-
   describe('fetchStageData', () => {
     const mockStagePath = /value_streams\/\w+\/stages\/\w+\/records/;
     const headers = {
@@ -529,14 +502,13 @@ describe('Project Value Stream Analytics actions', () => {
   });
 
   describe('fetchValueStreamStageData', () => {
-    it('will dispatch the fetchCycleAnalyticsData, fetchStageData, fetchStageMedians and fetchStageCountValues actions', () =>
+    it('will dispatch the fetchStageData, fetchStageMedians and fetchStageCountValues actions', () =>
       testAction({
         action: actions.fetchValueStreamStageData,
         state,
         payload: {},
         expectedMutations: [],
         expectedActions: [
-          { type: 'fetchCycleAnalyticsData' },
           { type: 'fetchStageData' },
           { type: 'fetchStageMedians' },
           { type: 'fetchStageCountValues' },
diff --git a/spec/frontend/cycle_analytics/store/mutations_spec.js b/spec/frontend/cycle_analytics/store/mutations_spec.js
index 2670a390e9c..2e9e5d91471 100644
--- a/spec/frontend/cycle_analytics/store/mutations_spec.js
+++ b/spec/frontend/cycle_analytics/store/mutations_spec.js
@@ -38,31 +38,24 @@ describe('Project Value Stream Analytics mutations', () => {
   });
 
   it.each`
-    mutation                                      | stateKey                 | value
-    ${types.REQUEST_VALUE_STREAMS}                | ${'valueStreams'}        | ${[]}
-    ${types.RECEIVE_VALUE_STREAMS_ERROR}          | ${'valueStreams'}        | ${[]}
-    ${types.REQUEST_VALUE_STREAM_STAGES}          | ${'stages'}              | ${[]}
-    ${types.RECEIVE_VALUE_STREAM_STAGES_ERROR}    | ${'stages'}              | ${[]}
-    ${types.REQUEST_CYCLE_ANALYTICS_DATA}         | ${'isLoading'}           | ${true}
-    ${types.REQUEST_CYCLE_ANALYTICS_DATA}         | ${'hasError'}            | ${false}
-    ${types.RECEIVE_CYCLE_ANALYTICS_DATA_SUCCESS} | ${'hasError'}            | ${false}
-    ${types.RECEIVE_CYCLE_ANALYTICS_DATA_ERROR}   | ${'isLoading'}           | ${false}
-    ${types.RECEIVE_CYCLE_ANALYTICS_DATA_ERROR}   | ${'hasError'}            | ${true}
-    ${types.REQUEST_STAGE_DATA}                   | ${'isLoadingStage'}      | ${true}
-    ${types.REQUEST_STAGE_DATA}                   | ${'isEmptyStage'}        | ${false}
-    ${types.REQUEST_STAGE_DATA}                   | ${'hasError'}            | ${false}
-    ${types.REQUEST_STAGE_DATA}                   | ${'selectedStageEvents'} | ${[]}
-    ${types.RECEIVE_STAGE_DATA_SUCCESS}           | ${'isLoadingStage'}      | ${false}
-    ${types.RECEIVE_STAGE_DATA_SUCCESS}           | ${'selectedStageEvents'} | ${[]}
-    ${types.RECEIVE_STAGE_DATA_SUCCESS}           | ${'hasError'}            | ${false}
-    ${types.RECEIVE_STAGE_DATA_ERROR}             | ${'isLoadingStage'}      | ${false}
-    ${types.RECEIVE_STAGE_DATA_ERROR}             | ${'selectedStageEvents'} | ${[]}
-    ${types.RECEIVE_STAGE_DATA_ERROR}             | ${'hasError'}            | ${true}
-    ${types.RECEIVE_STAGE_DATA_ERROR}             | ${'isEmptyStage'}        | ${true}
-    ${types.REQUEST_STAGE_MEDIANS}                | ${'medians'}             | ${{}}
-    ${types.RECEIVE_STAGE_MEDIANS_ERROR}          | ${'medians'}             | ${{}}
-    ${types.REQUEST_STAGE_COUNTS}                 | ${'stageCounts'}         | ${{}}
-    ${types.RECEIVE_STAGE_COUNTS_ERROR}           | ${'stageCounts'}         | ${{}}
+    mutation                                   | stateKey                 | value
+    ${types.REQUEST_VALUE_STREAMS}             | ${'valueStreams'}        | ${[]}
+    ${types.RECEIVE_VALUE_STREAMS_ERROR}       | ${'valueStreams'}        | ${[]}
+    ${types.REQUEST_VALUE_STREAM_STAGES}       | ${'stages'}              | ${[]}
+    ${types.RECEIVE_VALUE_STREAM_STAGES_ERROR} | ${'stages'}              | ${[]}
+    ${types.REQUEST_STAGE_DATA}                | ${'isLoadingStage'}      | ${true}
+    ${types.REQUEST_STAGE_DATA}                | ${'isEmptyStage'}        | ${false}
+    ${types.REQUEST_STAGE_DATA}                | ${'selectedStageEvents'} | ${[]}
+    ${types.RECEIVE_STAGE_DATA_SUCCESS}        | ${'isLoadingStage'}      | ${false}
+    ${types.RECEIVE_STAGE_DATA_SUCCESS}        | ${'selectedStageEvents'} | ${[]}
+    ${types.RECEIVE_STAGE_DATA_ERROR}          | ${'isLoadingStage'}      | ${false}
+    ${types.RECEIVE_STAGE_DATA_ERROR}          | ${'selectedStageEvents'} | ${[]}
+    ${types.RECEIVE_STAGE_DATA_ERROR}          | ${'isEmptyStage'}        | ${true}
+    ${types.REQUEST_STAGE_MEDIANS}             | ${'medians'}             | ${{}}
+    ${types.RECEIVE_STAGE_MEDIANS_ERROR}       | ${'medians'}             | ${{}}
+    ${types.REQUEST_STAGE_COUNTS}              | ${'stageCounts'}         | ${{}}
+    ${types.RECEIVE_STAGE_COUNTS_ERROR}        | ${'stageCounts'}         | ${{}}
+    ${types.SET_NO_ACCESS_ERROR}               | ${'hasNoAccessError'}    | ${true}
   `('$mutation will set $stateKey to $value', ({ mutation, stateKey, value }) => {
     mutations[mutation](state);