diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2016-12-22 14:12:16 +0000 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-12-22 18:52:33 -0200 |
commit | 60ed1a25980598b6ebc3401e6cf0abe54e17c577 (patch) | |
tree | 69341a7502f467c068507ea09583ed2244cbec63 | |
parent | 0478bea7247c95d3ee6eee922d1b1daa10e69f75 (diff) | |
download | gitlab-ce-60ed1a25980598b6ebc3401e6cf0abe54e17c577.tar.gz |
Merge branch 'fix/hide-retried-builds-in-pipeline-stage-dropdown' into 'master'
Do not show retried builds in pipeline stage dropdown
Closes #25980
See merge request !8260
3 files changed, 43 insertions, 7 deletions
diff --git a/app/views/projects/pipelines/_stage.html.haml b/app/views/projects/pipelines/_stage.html.haml index 20456e792e7..cf1b366bf2c 100644 --- a/app/views/projects/pipelines/_stage.html.haml +++ b/app/views/projects/pipelines/_stage.html.haml @@ -1,4 +1,4 @@ %ul - - @stage.statuses.each do |status| + - @stage.statuses.latest.each do |status| %li.dropdown-build = render 'ci/status/graph_badge', subject: status diff --git a/changelogs/unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml b/changelogs/unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml new file mode 100644 index 00000000000..66256d7ed0e --- /dev/null +++ b/changelogs/unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml @@ -0,0 +1,4 @@ +--- +title: Do not show retried builds in pipeline stage dropdown +merge_request: 8260 +author: diff --git a/spec/views/projects/pipelines/_stage.html.haml_spec.rb b/spec/views/projects/pipelines/_stage.html.haml_spec.rb index eb7f7ca4a1a..d25de8af5d2 100644 --- a/spec/views/projects/pipelines/_stage.html.haml_spec.rb +++ b/spec/views/projects/pipelines/_stage.html.haml_spec.rb @@ -7,15 +7,47 @@ describe 'projects/pipelines/_stage', :view do before do assign :stage, stage + end + + context 'when there are only latest builds present' do + before do + create(:ci_build, name: 'test:build', + stage: stage.name, + pipeline: pipeline) + end + + it 'shows the builds in the stage' do + render + + expect(rendered).to have_text 'test:build' + end + end + + context 'when build belongs to different stage' do + before do + create(:ci_build, name: 'test:build', + stage: 'other:stage', + pipeline: pipeline) + end - create(:ci_build, name: 'test:build', - stage: stage.name, - pipeline: pipeline) + it 'does not render build' do + render + + expect(rendered).not_to have_text 'test:build' + end end - it 'shows the builds in the stage' do - render + context 'when there are retried builds present' do + before do + create_list(:ci_build, 2, name: 'test:build', + stage: stage.name, + pipeline: pipeline) + end + + it 'shows only latest builds' do + render - expect(rendered).to have_text 'test:build' + expect(rendered).to have_text 'test:build', count: 1 + end end end |