kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix spec failures

This commit is contained in:
Kamil Trzciński 2018-08-01 10:56:12 +02:00
parent 8fe37da6cb
commit c944e22d50
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/ci/build.rb
View File

@ -580,12 +580,12 @@ module Ci
end
def has_valid_build_dependencies?
return true unless Feature.enabled?('ci_disable_validates_dependencies')
return true if Feature.enabled?('ci_disable_validates_dependencies')
dependencies.all?(&:is_valid_dependency?)
dependencies.all?(&:valid_dependency?)
end
def is_valid_dependency?
def valid_dependency?
return false if artifacts_expired?
return false if erased?

17
spec/models/ci/build_spec.rb
View File

@ -2414,13 +2414,13 @@ describe Ci::Build do
context 'when depended job has not been completed yet' do
let!(:pre_stage_job) { create(:ci_build, :manual, pipeline: pipeline, name: 'test', stage_idx: 0) }
it { expect { job.run! }.to have_valid_build_dependencies }
it { expect(job).to have_valid_build_dependencies }
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) }
it { expect { job.run! }.not_to have_valid_build_dependencies }
it { expect(job).not_to have_valid_build_dependencies }
end
context 'when artifacts of depended job has been erased' do
@ -2430,7 +2430,7 @@ describe Ci::Build do
pre_stage_job.erase
end
it { expect { job.run! }.not_to have_valid_build_dependencies }
it { expect(job).not_to have_valid_build_dependencies }
end
end
@ -2438,12 +2438,13 @@ describe Ci::Build do
context 'when depended job has not been completed yet' do
let!(:pre_stage_job) { create(:ci_build, :manual, pipeline: pipeline, name: 'test', stage_idx: 0) }
it { expect { job.run! }.to have_valid_build_dependencies }
it { expect(job).to have_valid_build_dependencies }
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) }
it { expect { job.run! }.to have_valid_build_dependencies }
it { expect(job).to have_valid_build_dependencies }
end
context 'when artifacts of depended job has been erased' do
@ -2453,7 +2454,7 @@ describe Ci::Build do
pre_stage_job.erase
end
it { expect { job.run! }.to have_valid_build_dependencies }
it { expect(job).to have_valid_build_dependencies }
end
end
@ -2469,13 +2470,13 @@ describe Ci::Build do
context 'when "dependencies" keyword is not defined' do
let(:options) { {} }
it { expect { job.run! }.not_to raise_error }
it { expect(job).to have_valid_build_dependencies }
end
context 'when "dependencies" keyword is empty' do
let(:options) { { dependencies: [] } }
it { expect { job.run! }.not_to raise_error }
it { expect(job).to have_valid_build_dependencies }
end
context 'when "dependencies" keyword is specified' do