diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-03-03 12:20:22 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-03-06 12:04:04 +0300 |
commit | b8dc2ab93f415f4ffb3cd2e16ea629b62723bba6 (patch) | |
tree | fd2e3fb68cc292e97fe61496f909b695b2497c1b /spec/services | |
parent | 50c393e58b01ff25f60b03b7c8419941a3f892cd (diff) |
Fix specs for pipeline processing with manual actions
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/ci/process_pipeline_service_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb index 2c1e139d5c9..d2cb1f5c0a0 100644 --- a/spec/services/ci/process_pipeline_service_spec.rb +++ b/spec/services/ci/process_pipeline_service_spec.rb @@ -62,7 +62,7 @@ describe Ci::ProcessPipelineService, :services do end end - context 'properly creates builds when "when" is defined' do + context 'properly creates builds when optional actions are defined' do before do create_build('build', stage_idx: 0) create_build('test', stage_idx: 1) @@ -192,7 +192,7 @@ describe Ci::ProcessPipelineService, :services do end end - context 'when listing manual actions' do + context 'when listing optional manual actions' do it 'returns only for skipped builds' do # currently all builds are created expect(process_pipeline).to be_truthy @@ -220,9 +220,9 @@ describe Ci::ProcessPipelineService, :services do builds.each(&:reload) end - context 'when first stage has only manual jobs' do + context 'when first stage has only optional manual actions' do let(:builds) do - [create_build('build', stage_idx: 0, when: 'manual'), + [create_build('build', stage_idx: 0, when: 'manual', allow_failure: true), create_build('check', stage_idx: 1), create_build('test', stage_idx: 2)] end @@ -232,10 +232,10 @@ describe Ci::ProcessPipelineService, :services do end end - context 'when second stage has only manual jobs' do + context 'when second stage has only optional manual actions' do let(:builds) do [create_build('check', stage_idx: 0), - create_build('build', stage_idx: 1, when: 'manual'), + create_build('build', stage_idx: 1, when: 'manual', allow_failure: true), create_build('test', stage_idx: 2)] end |