1 files changed, 65 insertions, 34 deletions
diff --git a/spec/services/ci/register_job_service_spec.rb b/spec/services/ci/register_job_service_spec.rb
index 16218b78fb8..3ee59014b5b 100644
--- a/spec/services/ci/register_job_service_spec.rb
+++ b/spec/services/ci/register_job_service_spec.rb
@@ -277,54 +277,85 @@ module Ci
       end
 
       context 'when "dependencies" keyword is specified' do
-        before do
-          stub_feature_flags(ci_disable_validates_dependencies: false)
+        shared_examples 'not pick' do
+          it 'does not pick the build and drops the build' do
+            expect(subject).to be_nil
+            expect(pending_job.reload).to be_failed
+            expect(pending_job).to be_missing_dependency_failure
+          end
         end
 
-        let!(:pre_stage_job) { create(:ci_build, :success, pipeline: pipeline, name: job_name, stage_idx: 0) }
+        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) }
+
+            it_behaves_like 'not pick'
+          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_behaves_like 'not pick'
+          end
+
+          context 'when artifacts of depended job has been erased' do
+            let!(:pre_stage_job) { create(:ci_build, :success, pipeline: pipeline, name: 'test', stage_idx: 0, erased_at: 1.minute.ago) }
+
+            before do
+              pre_stage_job.erase
+            end
 
-        let!(:pending_job) do
-          create(:ci_build, :pending, pipeline: pipeline, stage_idx: 1, options: { dependencies: ['spec'] } )
+            it_behaves_like 'not pick'
+          end
         end
 
-        let(:picked_job) { execute(specific_runner) }
+        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) }
 
-        context 'when a depended job exists' do
-          let(:job_name) { 'spec' }
+            it { expect(subject).to eq(pending_job) }
+          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 "picks the build" do
-            expect(picked_job).to eq(pending_job)
+            it { expect(subject).to eq(pending_job) }
           end
 
-          context 'when "artifacts" keyword is specified on depended job' do
-            let!(:pre_stage_job) do
-              create(:ci_build,
-                     :success,
-                     :artifacts,
-                     pipeline: pipeline,
-                     name: job_name,
-                     stage_idx: 0,
-                     options: { artifacts: { paths: ['binaries/'] } } )
-            end
+          context 'when artifacts of depended job has been erased' do
+            let!(:pre_stage_job) { create(:ci_build, :success, pipeline: pipeline, name: 'test', stage_idx: 0, erased_at: 1.minute.ago) }
 
-            context 'when artifacts of depended job has existsed' do
-              it "picks the build" do
-                expect(picked_job).to eq(pending_job)
-              end
+            before do
+              pre_stage_job.erase
             end
 
-            context 'when artifacts of depended job has not existsed' do
-              before do
-                pre_stage_job.erase
-              end
+            it { expect(subject).to eq(pending_job) }
+          end
+        end
 
-              it 'does not pick the build and drops the build' do
-                expect(picked_job).to be_nil
-                expect(pending_job.reload).to be_failed
-                expect(pending_job).to be_missing_dependency_failure
-              end
-            end
+        before do
+          stub_feature_flags(ci_disable_validates_dependencies: false)
+        end
+
+        let!(:pre_stage_job) { create(:ci_build, :success, pipeline: pipeline, name: 'test', stage_idx: 0) }
+        let!(:pending_job) { create(:ci_build, :pending, pipeline: pipeline, stage_idx: 1, options: { dependencies: ['test'] } ) }
+
+        subject { execute(specific_runner) }
+
+        context 'when validates for dependencies is enabled' do
+          before do
+            stub_feature_flags(ci_disable_validates_dependencies: false)
           end
+
+          it_behaves_like 'validation is active'
+        end
+
+        context 'when validates for dependencies is disabled' do
+          before do
+            stub_feature_flags(ci_disable_validates_dependencies: true)
+          end
+
+          it_behaves_like 'validation is not active'
         end
       end