Commit c944e22d authored by Kamil Trzciński's avatar Kamil Trzciński

Fix spec failures

parent 8fe37da6
...@@ -580,12 +580,12 @@ module Ci ...@@ -580,12 +580,12 @@ module Ci
end end
def has_valid_build_dependencies? 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 end
def is_valid_dependency? def valid_dependency?
return false if artifacts_expired? return false if artifacts_expired?
return false if erased? return false if erased?
......
...@@ -2414,13 +2414,13 @@ describe Ci::Build do ...@@ -2414,13 +2414,13 @@ describe Ci::Build do
context 'when depended job has not been completed yet' 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) } 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 end
context 'when artifacts of depended job has been expired' do 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) } 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 end
context 'when artifacts of depended job has been erased' do context 'when artifacts of depended job has been erased' do
...@@ -2430,7 +2430,7 @@ describe Ci::Build do ...@@ -2430,7 +2430,7 @@ describe Ci::Build do
pre_stage_job.erase pre_stage_job.erase
end end
it { expect { job.run! }.not_to have_valid_build_dependencies } it { expect(job).not_to have_valid_build_dependencies }
end end
end end
...@@ -2438,12 +2438,13 @@ describe Ci::Build do ...@@ -2438,12 +2438,13 @@ describe Ci::Build do
context 'when depended job has not been completed yet' 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) } 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 end
context 'when artifacts of depended job has been expired' do 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) } 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 end
context 'when artifacts of depended job has been erased' do context 'when artifacts of depended job has been erased' do
...@@ -2453,7 +2454,7 @@ describe Ci::Build do ...@@ -2453,7 +2454,7 @@ describe Ci::Build do
pre_stage_job.erase pre_stage_job.erase
end end
it { expect { job.run! }.to have_valid_build_dependencies } it { expect(job).to have_valid_build_dependencies }
end end
end end
...@@ -2469,13 +2470,13 @@ describe Ci::Build do ...@@ -2469,13 +2470,13 @@ describe Ci::Build do
context 'when "dependencies" keyword is not defined' do context 'when "dependencies" keyword is not defined' do
let(:options) { {} } let(:options) { {} }
it { expect { job.run! }.not_to raise_error } it { expect(job).to have_valid_build_dependencies }
end end
context 'when "dependencies" keyword is empty' do context 'when "dependencies" keyword is empty' do
let(:options) { { dependencies: [] } } let(:options) { { dependencies: [] } }
it { expect { job.run! }.not_to raise_error } it { expect(job).to have_valid_build_dependencies }
end end
context 'when "dependencies" keyword is specified' do context 'when "dependencies" keyword is specified' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment