From 73b9e5e7de09170482979c8550fc90d661534dc9 Mon Sep 17 00:00:00 2001
From: Jean Boussier <jean.boussier@gmail.com>
Date: Wed, 24 Oct 2018 14:12:09 -0400
Subject: [PATCH] Fix fetched? check in PerformTaskJob

---
 .rubocop.yml                        |  3 +++
 app/jobs/shipit/perform_task_job.rb |  2 +-
 test/jobs/perform_task_job_test.rb  | 11 ++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index fee42b629..de9448cd1 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -56,6 +56,9 @@ Style/DoubleNegation:
 Style/Next:
   Enabled: false
 
+Style/EmptyMethod:
+  Enabled: false
+
 Metrics/LineLength:
   Exclude:
     - config/routes.rb
diff --git a/app/jobs/shipit/perform_task_job.rb b/app/jobs/shipit/perform_task_job.rb
index 2ecf2f21b..f7db50fef 100644
--- a/app/jobs/shipit/perform_task_job.rb
+++ b/app/jobs/shipit/perform_task_job.rb
@@ -60,7 +60,7 @@ def perform_task
     end
 
     def checkout_repository
-      unless @commands.fetched?(@task.until_commit)
+      unless @commands.fetched?(@task.until_commit).tap(&:run).success?
         @task.acquire_git_cache_lock do
           capture! @commands.fetch
         end
diff --git a/test/jobs/perform_task_job_test.rb b/test/jobs/perform_task_job_test.rb
index b7754afd8..60a815d9b 100644
--- a/test/jobs/perform_task_job_test.rb
+++ b/test/jobs/perform_task_job_test.rb
@@ -2,6 +2,15 @@
 
 module Shipit
   class PerformTaskJobTest < ActiveSupport::TestCase
+    class FakeSuccessfulCommand
+      def run
+      end
+
+      def success?
+        true
+      end
+    end
+
     setup do
       @job = PerformTaskJob.new
       @deploy = shipit_deploys(:shipit_pending)
@@ -14,7 +23,7 @@ class PerformTaskJobTest < ActiveSupport::TestCase
       @commands = stub(:commands)
       Commands.expects(:for).with(@deploy).returns(@commands)
 
-      @commands.expects(:fetched?).once.returns(true)
+      @commands.expects(:fetched?).once.returns(FakeSuccessfulCommand.new)
       @commands.expects(:clone).returns([]).once
       @commands.expects(:checkout).with(@deploy.until_commit).once
       @commands.expects(:install_dependencies).returns([]).once