Fix /build_spec.rb
This commit is contained in:
parent
38d46754be
commit
6171db2d2d
2 changed files with 14 additions and 9 deletions
|
@ -490,6 +490,14 @@ module Ci
|
|||
end
|
||||
end
|
||||
|
||||
def valid_dependency?
|
||||
return false unless complete?
|
||||
return false if artifacts_expired?
|
||||
return false if erased?
|
||||
|
||||
true
|
||||
end
|
||||
|
||||
def hide_secrets(trace)
|
||||
return unless trace
|
||||
|
||||
|
@ -600,13 +608,5 @@ module Ci
|
|||
update_project_statistics
|
||||
end
|
||||
end
|
||||
|
||||
def valid_dependency?
|
||||
return false unless complete?
|
||||
return false if artifacts_expired?
|
||||
return false if erased?
|
||||
|
||||
true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1869,6 +1869,10 @@ describe Ci::Build do
|
|||
end
|
||||
|
||||
describe 'state transition: any => [:running]' do
|
||||
before do
|
||||
stub_feature_flags(ci_validates_dependencies: true)
|
||||
end
|
||||
|
||||
let(:build) { create(:ci_build, :pending, pipeline: pipeline, stage_idx: 1, options: options) }
|
||||
|
||||
context 'when "dependencies" keyword is not defined' do
|
||||
|
@ -1887,13 +1891,14 @@ describe Ci::Build do
|
|||
let(:options) { { dependencies: ['test'] } }
|
||||
|
||||
context 'when a depended job exists' do
|
||||
let!(:pre_stage_job) { create(:ci_build, pipeline: pipeline, name: 'test', stage_idx: 0) }
|
||||
let!(:pre_stage_job) { create(:ci_build, :success, pipeline: pipeline, name: 'test', stage_idx: 0) }
|
||||
|
||||
it { expect { build.run! }.not_to raise_error }
|
||||
|
||||
context 'when "artifacts" keyword is specified on depended job' do
|
||||
let!(:pre_stage_job) do
|
||||
create(:ci_build,
|
||||
:success,
|
||||
:artifacts,
|
||||
pipeline: pipeline,
|
||||
name: 'test',
|
||||
|
|
Loading…
Reference in a new issue