diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue index 124585cd3314718726a190077c21636680eb42b8..da5220248e3aeba55561b85d5e16e91bfc4565f8 100644 --- a/app/assets/javascripts/ide/components/pipelines/list.vue +++ b/app/assets/javascripts/ide/components/pipelines/list.vue @@ -47,7 +47,7 @@ export default { Pipeline #{{ latestPipeline.id }} diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js b/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js index 9f418069db4e365a9094fc98eef815cd95d2eb37..2eaa9348315cc0cd11ec7ce3dc919346a71edd88 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/mutations.js @@ -12,7 +12,14 @@ export default { state.isLoadingPipeline = false; if (pipeline) { - state.latestPipeline = pipeline; + state.latestPipeline = { + id: pipeline.id, + path: pipeline.path, + commit: pipeline.commit, + details: { + status: pipeline.details.status, + }, + }; state.stages = pipeline.details.stages.map((stage, i) => { const foundStage = state.stages.find(s => s.id === i); return { diff --git a/spec/javascripts/ide/mock_data.js b/spec/javascripts/ide/mock_data.js index 23c75b964d8fe452dd146d91dedd0b0bee32ce42..3359c829c6e8d866c55b00382011cd26a441bd65 100644 --- a/spec/javascripts/ide/mock_data.js +++ b/spec/javascripts/ide/mock_data.js @@ -89,14 +89,16 @@ export const fullPipelinesResponse = { pipelines: [ { id: '51', + path: 'test', commit: { - id: 'xxxxxxxxxxxxxxxxxxxx', + id: '123', }, details: { status: { icon: 'status_failed', text: 'failed', }, + stages: [...stages], }, }, { @@ -109,6 +111,7 @@ export const fullPipelinesResponse = { icon: 'status_passed', text: 'passed', }, + stages: [...stages], }, }, ], diff --git a/spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js b/spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js index d47ec33ad4d0e1af03d65002aac3825e1f294fe9..653af1128adac9159eb904ea28b43e51cc523edb 100644 --- a/spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js +++ b/spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js @@ -1,7 +1,7 @@ import mutations from '~/ide/stores/modules/pipelines/mutations'; import state from '~/ide/stores/modules/pipelines/state'; import * as types from '~/ide/stores/modules/pipelines/mutation_types'; -import { pipelines, stages } from '../../../mock_data'; +import { fullPipelinesResponse, stages } from '../../../mock_data'; describe('IDE pipelines mutations', () => { let mockedState; @@ -28,17 +28,25 @@ describe('IDE pipelines mutations', () => { describe(types.RECEIVE_LASTEST_PIPELINE_SUCCESS, () => { it('sets loading to false on success', () => { - mutations[types.RECEIVE_LASTEST_PIPELINE_SUCCESS](mockedState, pipelines[0]); + mutations[types.RECEIVE_LASTEST_PIPELINE_SUCCESS]( + mockedState, + fullPipelinesResponse.data.pipelines[0], + ); expect(mockedState.isLoadingPipeline).toBe(false); }); it('sets latestPipeline', () => { - mutations[types.RECEIVE_LASTEST_PIPELINE_SUCCESS](mockedState, pipelines[0]); + mutations[types.RECEIVE_LASTEST_PIPELINE_SUCCESS]( + mockedState, + fullPipelinesResponse.data.pipelines[0], + ); expect(mockedState.latestPipeline).toEqual({ - id: pipelines[0].id, - status: pipelines[0].status, + id: '51', + path: 'test', + commit: { id: '123' }, + details: { status: jasmine.any(Object) }, }); }); @@ -47,33 +55,12 @@ describe('IDE pipelines mutations', () => { expect(mockedState.latestPipeline).toEqual(null); }); - }); - - describe(types.REQUEST_STAGES, () => { - it('sets stages loading to true', () => { - mutations[types.REQUEST_STAGES](mockedState); - - expect(mockedState.isLoadingJobs).toBe(true); - }); - }); - - describe(types.RECEIVE_STAGES_ERROR, () => { - it('sets jobs loading to false', () => { - mutations[types.RECEIVE_STAGES_ERROR](mockedState); - - expect(mockedState.isLoadingJobs).toBe(false); - }); - }); - - describe(types.RECEIVE_STAGES_SUCCESS, () => { - it('sets jobs loading to false on success', () => { - mutations[types.RECEIVE_STAGES_SUCCESS](mockedState, stages); - - expect(mockedState.isLoadingJobs).toBe(false); - }); it('sets stages', () => { - mutations[types.RECEIVE_STAGES_SUCCESS](mockedState, stages); + mutations[types.RECEIVE_LASTEST_PIPELINE_SUCCESS]( + mockedState, + fullPipelinesResponse.data.pipelines[0], + ); expect(mockedState.stages.length).toBe(2); expect(mockedState.stages).toEqual([