Improve CommitStatusPresenter

2 files changed, 34 insertions, 7 deletions

diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb
index 3ac9c00602c..20a133ec8a2 100644
--- a/app/presenters/commit_status_presenter.rb
+++ b/app/presenters/commit_status_presenter.rb
@@ -2,18 +2,19 @@
 
 class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
   CALLOUT_FAILURE_MESSAGES = {
-      unknown_failure: 'There is an unknown failure, please try again',
-      api_failure: 'There has been an API failure, please try again',
-      stuck_or_timeout_failure: 'There has been a timeout failure or the job got stuck. Check your timeout limits or try again',
-      runner_system_failure: 'There has been a runner system failure, please try again',
-      missing_dependency_failure: 'There has been a missing dependency failure',
-      # COMMENTED to check if tests gonna fail: runner_unsupported: 'Your runner is unsupported. Upgrade runner to use new features of your Pipeline',
+    unknown_failure: 'There is an unknown failure, please try again',
+    script_failure: nil,
+    api_failure: 'There has been an API failure, please try again',
+    stuck_or_timeout_failure: 'There has been a timeout failure or the job got stuck. Check your timeout limits or try again',
+    runner_system_failure: 'There has been a runner system failure, please try again',
+    missing_dependency_failure: 'There has been a missing dependency failure',
+    runner_unsupported: 'Your runner is outdated, please upgrade your runner'
   }.freeze
 
   presents :build
 
   def callout_failure_message
-    CALLOUT_FAILURE_MESSAGES[failure_reason.to_sym]
+    CALLOUT_FAILURE_MESSAGES.fetch(failure_reason.to_sym)
   end
 
   def recoverable?
diff --git a/spec/presenters/commit_status_presenter_spec.rb b/spec/presenters/commit_status_presenter_spec.rb
index f81ee44e371..2b7742ddbb8 100644
--- a/spec/presenters/commit_status_presenter_spec.rb
+++ b/spec/presenters/commit_status_presenter_spec.rb
@@ -12,4 +12,30 @@ describe CommitStatusPresenter do
   it 'inherits from Gitlab::View::Presenter::Delegated' do
     expect(described_class.superclass).to eq(Gitlab::View::Presenter::Delegated)
   end
+
+  describe 'covers all failure reasons' do
+    let(:message) { presenter.callout_failure_message }
+
+    CommitStatus.failure_reasons.keys.each do |failure_reason|
+      context failure_reason do
+        before do
+          build.failure_reason = failure_reason
+        end
+
+        it "is a valid status" do
+          expect { message }.not_to raise_error
+        end
+      end
+    end
+
+    context 'invalid failure message' do
+      before do
+        expect(build).to receive(:failure_reason) { 'invalid failure message' }
+      end
+
+      it "is an invalid status" do
+        expect { message }.to raise_error(/key not found:/)
+      end
+    end
+  end
 end