diff --git a/app/models/project_services/jenkins_service.rb b/app/models/project_services/jenkins_service.rb index 2861c90709..e1ae9ff80d 100644 --- a/app/models/project_services/jenkins_service.rb +++ b/app/models/project_services/jenkins_service.rb @@ -72,7 +72,7 @@ class JenkinsService < CiService if response.code == 200 # img.build-caption-status-icon for old jenkins version src = Nokogiri.parse(response).css('img.build-caption-status-icon,.build-caption>img').first.attributes['src'].value - if src =~ /(blue\.png|yellow\.png)$/ + if src =~ /blue\.png$/ 'success' elsif src =~ /(red|aborted|yellow)\.png$/ 'failed' diff --git a/spec/models/project_services/jenkins_service_spec.rb b/spec/models/project_services/jenkins_service_spec.rb index 5be43ac483..08307d8174 100644 --- a/spec/models/project_services/jenkins_service_spec.rb +++ b/spec/models/project_services/jenkins_service_spec.rb @@ -45,7 +45,7 @@ eos end describe :commit_status do - statuses = {'blue.png' => 'success', 'yellow.png' => 'success', 'red.png' => 'failed', 'aborted.png' => 'failed', 'blue-anime.gif' => 'running', 'grey.png' => 'pending'} + statuses = {'blue.png' => 'success', 'yellow.png' => 'failed', 'red.png' => 'failed', 'aborted.png' => 'failed', 'blue-anime.gif' => 'running', 'grey.png' => 'pending'} statuses.each do |icon, state| it "should have a status of #{state} when the icon #{icon} exists." do stub_request(:get, "http://jenkins.gitlab.org/projects/2/scm/bySHA1/2ab7834c").to_return(status: 200, body: status_body_for_icon(icon), headers: {})