From c944e22d5087a87680737717ef2c6588320de64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Wed, 1 Aug 2018 10:56:12 +0200
Subject: [PATCH] Fix spec failures

---
 app/models/ci/build.rb       |  6 +++---
 spec/models/ci/build_spec.rb | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index db5ad300a12..93bbee49c09 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -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?
 
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index aa856b0d5b8..af3afc2911c 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -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