BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
ba907426
Unverified
Commit
ba907426
authored
May 14, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
group jobs into stages
parent
50985f54
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
171 additions
and
27 deletions
+171
-27
api.js
app/assets/javascripts/api.js
+2
-2
actions.js
...ssets/javascripts/ide/stores/modules/pipelines/actions.js
+11
-3
getters.js
...ssets/javascripts/ide/stores/modules/pipelines/getters.js
+6
-1
mutations.js
...ets/javascripts/ide/stores/modules/pipelines/mutations.js
+23
-7
state.js
app/assets/javascripts/ide/stores/modules/pipelines/state.js
+1
-1
mock_data.js
spec/javascripts/ide/mock_data.js
+7
-0
actions_spec.js
.../javascripts/ide/stores/modules/pipelines/actions_spec.js
+49
-2
getters_spec.js
.../javascripts/ide/stores/modules/pipelines/getters_spec.js
+31
-0
mutations_spec.js
...avascripts/ide/stores/modules/pipelines/mutations_spec.js
+41
-11
No files found.
app/assets/javascripts/api.js
View file @
ba907426
...
...
@@ -230,12 +230,12 @@ const Api = {
return
axios
.
get
(
url
,
{
params
});
},
pipelineJobs
(
projectPath
,
pipelineId
)
{
pipelineJobs
(
projectPath
,
pipelineId
,
params
=
{}
)
{
const
url
=
Api
.
buildUrl
(
this
.
pipelineJobsPath
)
.
replace
(
':id'
,
encodeURIComponent
(
projectPath
))
.
replace
(
':pipeline_id'
,
pipelineId
);
return
axios
.
get
(
url
);
return
axios
.
get
(
url
,
{
params
}
);
},
buildUrl
(
url
)
{
...
...
app/assets/javascripts/ide/stores/modules/pipelines/actions.js
View file @
ba907426
...
...
@@ -28,12 +28,20 @@ export const receiveJobsError = ({ commit }) => {
};
export
const
receiveJobsSuccess
=
({
commit
},
data
)
=>
commit
(
types
.
RECEIVE_JOBS_SUCCESS
,
data
);
export
const
fetchJobs
=
({
dispatch
,
state
,
rootState
})
=>
{
export
const
fetchJobs
=
({
dispatch
,
state
,
rootState
}
,
page
=
'1'
)
=>
{
dispatch
(
'requestJobs'
);
Api
.
pipelineJobs
(
rootState
.
currentProjectId
,
state
.
latestPipeline
.
id
)
.
then
(({
data
})
=>
{
Api
.
pipelineJobs
(
rootState
.
currentProjectId
,
state
.
latestPipeline
.
id
,
{
page
,
})
.
then
(({
data
,
headers
})
=>
{
const
nextPage
=
headers
&&
headers
[
'x-next-page'
];
dispatch
(
'receiveJobsSuccess'
,
data
);
if
(
nextPage
)
{
dispatch
(
'fetchJobs'
,
nextPage
);
}
})
.
catch
(()
=>
dispatch
(
'receiveJobsError'
));
};
...
...
app/assets/javascripts/ide/stores/modules/pipelines/getters.js
View file @
ba907426
// eslint-disable-next-line import/prefer-default-export
export
const
hasLatestPipeline
=
state
=>
!
state
.
isLoadingPipeline
&&
!!
state
.
latestPipeline
;
export
const
failedJobs
=
state
=>
state
.
stages
.
reduce
(
(
acc
,
stage
)
=>
acc
.
concat
(
stage
.
jobs
.
filter
(
job
=>
job
.
status
===
'failed'
)),
[],
);
app/assets/javascripts/ide/stores/modules/pipelines/mutations.js
View file @
ba907426
...
...
@@ -26,12 +26,28 @@ export default {
},
[
types
.
RECEIVE_JOBS_SUCCESS
](
state
,
jobs
)
{
state
.
isLoadingJobs
=
false
;
state
.
jobs
=
jobs
.
map
(
job
=>
({
id
:
job
.
id
,
name
:
job
.
name
,
status
:
job
.
status
,
stage
:
job
.
stage
,
duration
:
job
.
duration
,
}));
state
.
stages
=
jobs
.
reduce
((
acc
,
job
)
=>
{
let
stage
=
acc
.
find
(
s
=>
s
.
title
===
job
.
stage
);
if
(
!
stage
)
{
stage
=
{
title
:
job
.
stage
,
jobs
:
[],
};
acc
.
push
(
stage
);
}
stage
.
jobs
=
stage
.
jobs
.
concat
({
id
:
job
.
id
,
name
:
job
.
name
,
status
:
job
.
status
,
stage
:
job
.
stage
,
duration
:
job
.
duration
,
});
return
acc
;
},
state
.
stages
);
},
};
app/assets/javascripts/ide/stores/modules/pipelines/state.js
View file @
ba907426
...
...
@@ -2,5 +2,5 @@ export default () => ({
isLoadingPipeline
:
false
,
isLoadingJobs
:
false
,
latestPipeline
:
null
,
job
s
:
[],
stage
s
:
[],
});
spec/javascripts/ide/mock_data.js
View file @
ba907426
...
...
@@ -51,4 +51,11 @@ export const jobs = [
stage
:
'test'
,
duration
:
1
,
},
{
id
:
4
,
name
:
'test 3'
,
status
:
'failed'
,
stage
:
'build'
,
duration
:
1
,
},
];
spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
View file @
ba907426
...
...
@@ -182,13 +182,21 @@ describe('IDE pipelines actions', () => {
});
describe
(
'fetchJobs'
,
()
=>
{
let
page
=
''
;
beforeEach
(()
=>
{
mockedState
.
latestPipeline
=
pipelines
[
0
];
});
describe
(
'success'
,
()
=>
{
beforeEach
(()
=>
{
mock
.
onGet
(
/
\/
api
\/
v4
\/
projects
\/(
.*
)\/
pipelines
\/(
.*
)\/
jobs/
).
replyOnce
(
200
,
jobs
);
mock
.
onGet
(
/
\/
api
\/
v4
\/
projects
\/(
.*
)\/
pipelines
\/(
.*
)\/
jobs/
).
replyOnce
(()
=>
[
200
,
jobs
,
{
'x-next-page'
:
page
,
},
]);
});
it
(
'dispatches request'
,
done
=>
{
...
...
@@ -213,12 +221,51 @@ describe('IDE pipelines actions', () => {
);
});
it
(
'dispatches twice for both pages'
,
done
=>
{
page
=
'2'
;
testAction
(
fetchJobs
,
null
,
mockedState
,
[],
[
{
type
:
'requestJobs'
},
{
type
:
'receiveJobsSuccess'
,
payload
:
jobs
},
{
type
:
'fetchJobs'
,
payload
:
'2'
},
{
type
:
'requestJobs'
},
{
type
:
'receiveJobsSuccess'
,
payload
:
jobs
},
],
done
,
);
});
it
(
'calls axios with correct URL'
,
()
=>
{
const
apiSpy
=
spyOn
(
axios
,
'get'
).
and
.
callThrough
();
fetchJobs
({
dispatch
()
{},
state
:
mockedState
,
rootState
:
mockedState
});
expect
(
apiSpy
).
toHaveBeenCalledWith
(
'/api/v4/projects/test%2Fproject/pipelines/1/jobs'
);
expect
(
apiSpy
).
toHaveBeenCalledWith
(
'/api/v4/projects/test%2Fproject/pipelines/1/jobs'
,
{
params
:
{
page
:
'1'
},
});
});
it
(
'calls axios with page next page'
,
()
=>
{
const
apiSpy
=
spyOn
(
axios
,
'get'
).
and
.
callThrough
();
fetchJobs
({
dispatch
()
{},
state
:
mockedState
,
rootState
:
mockedState
});
expect
(
apiSpy
).
toHaveBeenCalledWith
(
'/api/v4/projects/test%2Fproject/pipelines/1/jobs'
,
{
params
:
{
page
:
'1'
},
});
page
=
'2'
;
fetchJobs
({
dispatch
()
{},
state
:
mockedState
,
rootState
:
mockedState
},
page
);
expect
(
apiSpy
).
toHaveBeenCalledWith
(
'/api/v4/projects/test%2Fproject/pipelines/1/jobs'
,
{
params
:
{
page
:
'2'
},
});
});
});
...
...
spec/javascripts/ide/stores/modules/pipelines/getters_spec.js
View file @
ba907426
...
...
@@ -37,4 +37,35 @@ describe('IDE pipeline getters', () => {
expect
(
getters
.
hasLatestPipeline
(
mockedState
)).
toBe
(
true
);
});
});
describe
(
'failedJobs'
,
()
=>
{
it
(
'returns array of failed jobs'
,
()
=>
{
mockedState
.
stages
=
[
{
title
:
'test'
,
jobs
:
[{
id
:
1
,
status
:
'failed'
},
{
id
:
2
,
status
:
'success'
}],
},
{
title
:
'build'
,
jobs
:
[{
id
:
3
,
status
:
'failed'
},
{
id
:
4
,
status
:
'failed'
}],
},
];
expect
(
getters
.
failedJobs
(
mockedState
).
length
).
toBe
(
3
);
expect
(
getters
.
failedJobs
(
mockedState
)).
toEqual
([
{
id
:
1
,
status
:
jasmine
.
anything
(),
},
{
id
:
3
,
status
:
jasmine
.
anything
(),
},
{
id
:
4
,
status
:
jasmine
.
anything
(),
},
]);
});
});
});
spec/javascripts/ide/stores/modules/pipelines/mutations_spec.js
View file @
ba907426
...
...
@@ -72,19 +72,49 @@ describe('IDE pipelines mutations', () => {
expect
(
mockedState
.
isLoadingJobs
).
toBe
(
false
);
});
it
(
'sets
job
s'
,
()
=>
{
it
(
'sets
stage
s'
,
()
=>
{
mutations
[
types
.
RECEIVE_JOBS_SUCCESS
](
mockedState
,
jobs
);
expect
(
mockedState
.
jobs
.
length
).
toBe
(
3
);
expect
(
mockedState
.
jobs
).
toEqual
(
jobs
.
map
(
job
=>
({
id
:
job
.
id
,
name
:
job
.
name
,
status
:
job
.
status
,
stage
:
job
.
stage
,
duration
:
job
.
duration
,
})),
);
expect
(
mockedState
.
stages
.
length
).
toBe
(
2
);
expect
(
mockedState
.
stages
).
toEqual
([
{
title
:
'test'
,
jobs
:
jasmine
.
anything
(),
},
{
title
:
'build'
,
jobs
:
jasmine
.
anything
(),
},
]);
});
it
(
'sets jobs in stages'
,
()
=>
{
mutations
[
types
.
RECEIVE_JOBS_SUCCESS
](
mockedState
,
jobs
);
expect
(
mockedState
.
stages
[
0
].
jobs
.
length
).
toBe
(
3
);
expect
(
mockedState
.
stages
[
1
].
jobs
.
length
).
toBe
(
1
);
expect
(
mockedState
.
stages
).
toEqual
([
{
title
:
jasmine
.
anything
(),
jobs
:
jobs
.
filter
(
job
=>
job
.
stage
===
'test'
).
map
(
job
=>
({
id
:
job
.
id
,
name
:
job
.
name
,
status
:
job
.
status
,
stage
:
job
.
stage
,
duration
:
job
.
duration
,
})),
},
{
title
:
jasmine
.
anything
(),
jobs
:
jobs
.
filter
(
job
=>
job
.
stage
===
'build'
).
map
(
job
=>
({
id
:
job
.
id
,
name
:
job
.
name
,
status
:
job
.
status
,
stage
:
job
.
stage
,
duration
:
job
.
duration
,
})),
},
]);
});
});
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment