diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-26 09:48:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-06-26 09:48:48 +0000 |
| commit | 4503240abdd9a38e801aef49edad9ff9c7f9457d (patch) | |
| tree | 801f974ef54782e0cb7a7d5dd6373749dcd30e1a /spec/services | |
| parent | 07f6ab2b5339e3db171b6b53c972e1bdf17dffc9 (diff) | |
| parent | caf6b9918e3f7a79c9ffcffd1880f29422d50eb5 (diff) | |
| download | gitlab-ce-4503240abdd9a38e801aef49edad9ff9c7f9457d.tar.gz | |
Merge branch 'fix/gb/fix-skipped-pipeline-with-allowed-to-fail-jobs' into 'master'
Fix pipeline status when allowed to fail jobs present
Closes #29059
See merge request !11166
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/ci/process_pipeline_service_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb index 1557cb3c938..efcaccc254e 100644 --- a/spec/services/ci/process_pipeline_service_spec.rb +++ b/spec/services/ci/process_pipeline_service_spec.rb @@ -62,6 +62,10 @@ describe Ci::ProcessPipelineService, '#execute', :services do fail_running_or_pending expect(builds_statuses).to eq %w(failed pending) + + fail_running_or_pending + + expect(pipeline.reload).to be_success end end |