Fix stage status shown for pipelines
This commit is contained in:
parent
50abec8ca3
commit
3a3d999601
|
@ -58,6 +58,7 @@ v 8.10.0 (unreleased)
|
||||||
- Collapse large diffs by default (!4990)
|
- Collapse large diffs by default (!4990)
|
||||||
- Check for conflicts with existing Project's wiki path when creating a new project.
|
- Check for conflicts with existing Project's wiki path when creating a new project.
|
||||||
- Show last push widget in upstream after push to fork
|
- Show last push widget in upstream after push to fork
|
||||||
|
- Fix stage status shown for pipelines
|
||||||
- Cache todos pending/done dashboard query counts.
|
- Cache todos pending/done dashboard query counts.
|
||||||
- Don't instantiate a git tree on Projects show default view
|
- Don't instantiate a git tree on Projects show default view
|
||||||
- Bump Rinku to 2.0.0
|
- Bump Rinku to 2.0.0
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
Cant find HEAD commit for this branch
|
Cant find HEAD commit for this branch
|
||||||
|
|
||||||
|
|
||||||
- stages_status = pipeline.statuses.stages_status
|
- stages_status = pipeline.statuses.latest.stages_status
|
||||||
- stages.each do |stage|
|
- stages.each do |stage|
|
||||||
%td
|
%td
|
||||||
- status = stages_status[stage]
|
- status = stages_status[stage]
|
||||||
|
|
|
@ -177,10 +177,10 @@ describe CommitStatus, models: true do
|
||||||
|
|
||||||
describe '#stages' do
|
describe '#stages' do
|
||||||
before do
|
before do
|
||||||
FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'build', stage_idx: 0, status: 'success'
|
create :commit_status, pipeline: pipeline, stage: 'build', name: 'linux', stage_idx: 0, status: 'success'
|
||||||
FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'build', stage_idx: 0, status: 'failed'
|
create :commit_status, pipeline: pipeline, stage: 'build', name: 'mac', stage_idx: 0, status: 'failed'
|
||||||
FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'deploy', stage_idx: 2, status: 'running'
|
create :commit_status, pipeline: pipeline, stage: 'deploy', name: 'staging', stage_idx: 2, status: 'running'
|
||||||
FactoryGirl.create :commit_status, pipeline: pipeline, stage: 'test', stage_idx: 1, status: 'success'
|
create :commit_status, pipeline: pipeline, stage: 'test', name: 'rspec', stage_idx: 1, status: 'success'
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'stages list' do
|
context 'stages list' do
|
||||||
|
@ -192,7 +192,7 @@ describe CommitStatus, models: true do
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'stages with statuses' do
|
context 'stages with statuses' do
|
||||||
subject { CommitStatus.where(pipeline: pipeline).stages_status }
|
subject { CommitStatus.where(pipeline: pipeline).latest.stages_status }
|
||||||
|
|
||||||
it 'return list of stages with statuses' do
|
it 'return list of stages with statuses' do
|
||||||
is_expected.to eq({
|
is_expected.to eq({
|
||||||
|
@ -201,6 +201,20 @@ describe CommitStatus, models: true do
|
||||||
'deploy' => 'running'
|
'deploy' => 'running'
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'when build is retried' do
|
||||||
|
before do
|
||||||
|
create :commit_status, pipeline: pipeline, stage: 'build', name: 'mac', stage_idx: 0, status: 'success'
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'ignores a previous state' do
|
||||||
|
is_expected.to eq({
|
||||||
|
'build' => 'success',
|
||||||
|
'test' => 'success',
|
||||||
|
'deploy' => 'running'
|
||||||
|
})
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue