summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-05-25 16:00:00 +0100
committerPhil Hughes <me@iamphill.com>2018-05-25 16:00:00 +0100
commitaca0d610fd1beb7e9e93daa8e59977417e9f8d2d (patch)
tree4b7bfe0eef005ec1514bd9fca297fd4ec7b30a70
parentcdc92d94e0c676bf86877a5794d72bd4dcf88c24 (diff)
downloadgitlab-ce-aca0d610fd1beb7e9e93daa8e59977417e9f8d2d.tar.gz
fixed mutations spec
-rw-r--r--app/assets/javascripts/ide/components/pipelines/list.vue2
-rw-r--r--app/assets/javascripts/ide/stores/modules/pipelines/mutations.js9
-rw-r--r--spec/javascripts/ide/mock_data.js5
-rw-r--r--spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js47
4 files changed, 30 insertions, 33 deletions
diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue
index 124585cd331..da5220248e3 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
</strong>
<a
- :href="latestPipeline.details.status.details_path"
+ :href="latestPipeline.path"
target="_blank"
>
#{{ 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 9f418069db4..2eaa9348315 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 23c75b964d8..3359c829c6e 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 d47ec33ad4d..653af1128ad 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([