Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/frontend/logs')
-rw-r--r--spec/frontend/logs/components/environment_logs_spec.js3
-rw-r--r--spec/frontend/logs/mock_data.js27
-rw-r--r--spec/frontend/logs/stores/actions_spec.js27
-rw-r--r--spec/frontend/logs/stores/getters_spec.js48
-rw-r--r--spec/frontend/logs/stores/mutations_spec.js36
5 files changed, 2 insertions, 139 deletions
diff --git a/spec/frontend/logs/components/environment_logs_spec.js b/spec/frontend/logs/components/environment_logs_spec.js
index b40d9d7d5e2..b107708ac2c 100644
--- a/spec/frontend/logs/components/environment_logs_spec.js
+++ b/spec/frontend/logs/components/environment_logs_spec.js
@@ -12,7 +12,6 @@ import {
mockTrace,
mockEnvironmentsEndpoint,
mockDocumentationPath,
- mockManagedAppsEndpoint,
} from '../mock_data';
jest.mock('~/lib/utils/scroll_utils');
@@ -35,7 +34,7 @@ describe('EnvironmentLogs', () => {
environmentName: mockEnvName,
environmentsPath: mockEnvironmentsEndpoint,
clusterApplicationsDocumentationPath: mockDocumentationPath,
- clustersPath: mockManagedAppsEndpoint,
+ clustersPath: '/gitlab-org',
};
const updateControlBtnsMock = jest.fn();
diff --git a/spec/frontend/logs/mock_data.js b/spec/frontend/logs/mock_data.js
index 3fabab4bc59..14c8f7a2ba2 100644
--- a/spec/frontend/logs/mock_data.js
+++ b/spec/frontend/logs/mock_data.js
@@ -7,8 +7,6 @@ export const mockDocumentationPath = '/documentation.md';
export const mockLogsEndpoint = '/dummy_logs_path.json';
export const mockCursor = 'MOCK_CURSOR';
export const mockNextCursor = 'MOCK_NEXT_CURSOR';
-export const mockManagedAppName = 'kubernetes-cluster-1';
-export const mockManagedAppsEndpoint = `${mockProjectPath}/clusters.json`;
const makeMockEnvironment = (id, name, advancedQuerying) => ({
id,
@@ -25,31 +23,6 @@ export const mockEnvironments = [
makeMockEnvironment(102, 'review/a-feature', false),
];
-export const mockManagedApps = [
- {
- cluster_type: 'project_type',
- enabled: true,
- environment_scope: '*',
- name: 'kubernetes-cluster-1',
- provider_type: 'user',
- status: 'connected',
- path: '/root/autodevops-deploy/-/clusters/15',
- gitlab_managed_apps_logs_path: '/root/autodevops-deploy/-/logs?cluster_id=15',
- enable_advanced_logs_querying: true,
- },
- {
- cluster_type: 'project_type',
- enabled: true,
- environment_scope: '*',
- name: 'kubernetes-cluster-2',
- provider_type: 'user',
- status: 'connected',
- path: '/root/autodevops-deploy/-/clusters/16',
- gitlab_managed_apps_logs_path: null,
- enable_advanced_logs_querying: false,
- },
-];
-
export const mockPodName = 'production-764c58d697-aaaaa';
export const mockPods = [
mockPodName,
diff --git a/spec/frontend/logs/stores/actions_spec.js b/spec/frontend/logs/stores/actions_spec.js
index d5118bbde8c..9307a3b62fb 100644
--- a/spec/frontend/logs/stores/actions_spec.js
+++ b/spec/frontend/logs/stores/actions_spec.js
@@ -11,7 +11,6 @@ import {
fetchEnvironments,
fetchLogs,
fetchMoreLogsPrepend,
- fetchManagedApps,
} from '~/logs/stores/actions';
import * as types from '~/logs/stores/mutation_types';
import logsPageState from '~/logs/stores/state';
@@ -31,8 +30,6 @@ import {
mockResponse,
mockCursor,
mockNextCursor,
- mockManagedApps,
- mockManagedAppsEndpoint,
} from '../mock_data';
jest.mock('~/flash');
@@ -219,30 +216,6 @@ 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/getters_spec.js b/spec/frontend/logs/stores/getters_spec.js
index bca1ce4ca92..9d213d8c01f 100644
--- a/spec/frontend/logs/stores/getters_spec.js
+++ b/spec/frontend/logs/stores/getters_spec.js
@@ -1,14 +1,7 @@
import { trace, showAdvancedFilters } from '~/logs/stores/getters';
import logsPageState from '~/logs/stores/state';
-import {
- mockLogsResult,
- mockTrace,
- mockEnvName,
- mockEnvironments,
- mockManagedApps,
- mockManagedAppName,
-} from '../mock_data';
+import { mockLogsResult, mockTrace, mockEnvName, mockEnvironments } from '../mock_data';
describe('Logs Store getters', () => {
let state;
@@ -79,43 +72,4 @@ describe('Logs Store getters', () => {
});
});
});
-
- describe('when no managedApps are set', () => {
- beforeEach(() => {
- state.environments.current = null;
- state.environments.options = [];
- state.managedApps.current = mockManagedAppName;
- state.managedApps.options = [];
- });
-
- it('returns false', () => {
- expect(showAdvancedFilters(state)).toBe(false);
- });
- });
-
- describe('when the managedApp supports filters', () => {
- beforeEach(() => {
- state.environments.current = null;
- state.environments.options = mockEnvironments;
- state.managedApps.current = mockManagedAppName;
- state.managedApps.options = mockManagedApps;
- });
-
- it('returns true', () => {
- expect(showAdvancedFilters(state)).toBe(true);
- });
- });
-
- describe('when the managedApp does not support filters', () => {
- beforeEach(() => {
- state.environments.current = null;
- state.environments.options = mockEnvironments;
- state.managedApps.options = mockManagedApps;
- state.managedApps.current = mockManagedApps[1].name;
- });
-
- it('returns false', () => {
- expect(showAdvancedFilters(state)).toBe(false);
- });
- });
});
diff --git a/spec/frontend/logs/stores/mutations_spec.js b/spec/frontend/logs/stores/mutations_spec.js
index 111c795ba52..988197a8350 100644
--- a/spec/frontend/logs/stores/mutations_spec.js
+++ b/spec/frontend/logs/stores/mutations_spec.js
@@ -11,8 +11,6 @@ import {
mockSearch,
mockCursor,
mockNextCursor,
- mockManagedApps,
- mockManagedAppName,
} from '../mock_data';
describe('Logs Store Mutations', () => {
@@ -32,15 +30,6 @@ 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);
});
});
@@ -265,29 +254,4 @@ 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.length).toEqual(1);
- expect(state.managedApps.options).toEqual([mockManagedApps[0]]);
- 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,
- });
- });
- });
});