diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-12-14 17:28:40 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-12-14 17:28:40 +0900 |
commit | 1def948bd05de9f7b3c6437695c28b8570cf15d4 (patch) | |
tree | a8f4074fcf5cfa0763052593f15c5619b262d211 /spec/models | |
parent | 9daeccfb3ae70bd394be21ac2c1ed87b44cef7fe (diff) | |
download | gitlab-ce-1def948bd05de9f7b3c6437695c28b8570cf15d4.tar.gz |
Dependencies Validator fails when depended job is `manual`41110-dependencies-validator-fails-when-depended-job-is-manual
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/ci/build_spec.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index c5e23532aa5..871e8b47650 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -1861,9 +1861,9 @@ describe Ci::Build do describe 'state transition: any => [:running]' do shared_examples 'validation is active' do context 'when depended job has not been completed yet' do - let!(:pre_stage_job) { create(:ci_build, :running, pipeline: pipeline, name: 'test', stage_idx: 0) } + let!(:pre_stage_job) { create(:ci_build, :manual, pipeline: pipeline, name: 'test', stage_idx: 0) } - it { expect { job.run! }.to raise_error(Ci::Build::MissingDependenciesError) } + it { expect { job.run! }.not_to raise_error(Ci::Build::MissingDependenciesError) } end context 'when artifacts of depended job has been expired' do @@ -1885,11 +1885,10 @@ describe Ci::Build do shared_examples 'validation is not active' do context 'when depended job has not been completed yet' do - let!(:pre_stage_job) { create(:ci_build, :running, pipeline: pipeline, name: 'test', stage_idx: 0) } + let!(:pre_stage_job) { create(:ci_build, :manual, pipeline: pipeline, name: 'test', stage_idx: 0) } it { expect { job.run! }.not_to raise_error } end - context 'when artifacts of depended job has been expired' do let!(:pre_stage_job) { create(:ci_build, :success, :expired, pipeline: pipeline, name: 'test', stage_idx: 0) } |