Add latest changes from gitlab-org/gitlab@13-2-stable-ee

2 files changed, 62 insertions, 0 deletions

diff --git a/spec/frontend/logs/stores/actions_spec.js b/spec/frontend/logs/stores/actions_spec.js
index e2e3c3d23c6..acd9536a682 100644
--- a/spec/frontend/logs/stores/actions_spec.js
+++ b/spec/frontend/logs/stores/actions_spec.js
@@ -11,6 +11,7 @@ import {
   fetchEnvironments,
   fetchLogs,
   fetchMoreLogsPrepend,
+  fetchManagedApps,
 } from '~/logs/stores/actions';
 
 import { defaultTimeRange } from '~/vue_shared/constants';
@@ -30,6 +31,8 @@ import {
   mockResponse,
   mockCursor,
   mockNextCursor,
+  mockManagedApps,
+  mockManagedAppsEndpoint,
 } from '../mock_data';
 import { TOKEN_TYPE_POD_NAME } from '~/logs/constants';
 
@@ -217,6 +220,30 @@ describe('Logs Store actions', () => {
     });
   });
 
+  describe('fetchManagedApps', () => {
+    beforeEach(() => {
+      mock = new MockAdapter(axios);
+    });
+
+    it('should commit RECEIVE_MANAGED_APPS_DATA_SUCCESS mutation on succesful fetch', () => {
+      mock.onGet(mockManagedAppsEndpoint).replyOnce(200, { clusters: mockManagedApps });
+      return testAction(fetchManagedApps, mockManagedAppsEndpoint, state, [
+        { type: types.RECEIVE_MANAGED_APPS_DATA_SUCCESS, payload: mockManagedApps },
+      ]);
+    });
+
+    it('should commit RECEIVE_MANAGED_APPS_DATA_ERROR on wrong data', () => {
+      mock.onGet(mockManagedAppsEndpoint).replyOnce(500);
+      return testAction(
+        fetchManagedApps,
+        mockManagedAppsEndpoint,
+        state,
+        [{ type: types.RECEIVE_MANAGED_APPS_DATA_ERROR }],
+        [],
+      );
+    });
+  });
+
   describe('when the backend responds succesfully', () => {
     let expectedMutations;
     let expectedActions;
diff --git a/spec/frontend/logs/stores/mutations_spec.js b/spec/frontend/logs/stores/mutations_spec.js
index 46561055a4a..137533f02d7 100644
--- a/spec/frontend/logs/stores/mutations_spec.js
+++ b/spec/frontend/logs/stores/mutations_spec.js
@@ -11,6 +11,8 @@ import {
   mockSearch,
   mockCursor,
   mockNextCursor,
+  mockManagedApps,
+  mockManagedAppName,
 } from '../mock_data';
 
 describe('Logs Store Mutations', () => {
@@ -30,6 +32,15 @@ describe('Logs Store Mutations', () => {
     it('sets the environment', () => {
       mutations[types.SET_PROJECT_ENVIRONMENT](state, mockEnvName);
       expect(state.environments.current).toEqual(mockEnvName);
+      expect(state.managedApps.current).toBe(null);
+    });
+  });
+
+  describe('SET_MANAGED_APP', () => {
+    it('sets the managed app', () => {
+      mutations[types.SET_MANAGED_APP](state, mockManagedAppName);
+      expect(state.managedApps.current).toBe(mockManagedAppName);
+      expect(state.environments.current).toBe(null);
     });
   });
 
@@ -254,4 +265,28 @@ describe('Logs Store Mutations', () => {
       );
     });
   });
+
+  describe('RECEIVE_MANAGED_APPS_DATA_SUCCESS', () => {
+    it('receives managed apps data success', () => {
+      expect(state.managedApps.options).toEqual([]);
+
+      mutations[types.RECEIVE_MANAGED_APPS_DATA_SUCCESS](state, mockManagedApps);
+
+      expect(state.managedApps.options).toEqual(mockManagedApps);
+      expect(state.managedApps.isLoading).toBe(false);
+    });
+  });
+
+  describe('RECEIVE_MANAGED_APPS_DATA_ERROR', () => {
+    it('received managed apps data error', () => {
+      mutations[types.RECEIVE_MANAGED_APPS_DATA_ERROR](state);
+
+      expect(state.managedApps).toEqual({
+        options: [],
+        isLoading: false,
+        current: null,
+        fetchError: true,
+      });
+    });
+  });
 });