Fix /build_spec.rb

2 files changed, 14 insertions, 9 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index a29fb0ad2ca..fbda0962a91 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -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
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 6d33d0d917a..2cacf04a791 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -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',