From 7a7a4356d18c47260522290a4c5a14dff106006a Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Wed, 30 May 2018 08:18:18 -0500 Subject: Moves script_failure conditional over lambda So the 'failed' message can actually indicate if the build failed or not --- app/serializers/job_entity.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/serializers/job_entity.rb b/app/serializers/job_entity.rb index 30f0bda9418..960e7291ae6 100644 --- a/app/serializers/job_entity.rb +++ b/app/serializers/job_entity.rb @@ -26,7 +26,7 @@ class JobEntity < Grape::Entity expose :created_at expose :updated_at expose :detailed_status, as: :status, with: StatusEntity - expose :callout_message, if: -> (*) { failed? } + expose :callout_message, if: -> (*) { failed? && !build.script_failure? } expose :recoverable, if: -> (*) { failed? } private @@ -54,7 +54,7 @@ class JobEntity < Grape::Entity end def failed? - build.failed? && !build.script_failure? + build.failed? end def callout_message -- cgit v1.2.1