Commit 0ec3a031 authored by Toon Claes's avatar Toon Claes

Show the test coverage if it is available

Do not check if coverage is enabled, just show it when it is available.
parent 49bdd8d6
...@@ -452,7 +452,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -452,7 +452,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
if pipeline if pipeline
status = pipeline.status status = pipeline.status
coverage = pipeline.try(:coverage) coverage = pipeline.coverage
status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings? status = "success_with_warnings" if pipeline.success? && pipeline.has_warnings?
......
...@@ -1110,10 +1110,6 @@ class Project < ActiveRecord::Base ...@@ -1110,10 +1110,6 @@ class Project < ActiveRecord::Base
self.runners_token && ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.runners_token) self.runners_token && ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.runners_token)
end end
def build_coverage_enabled?
build_coverage_regex.present?
end
def build_timeout_in_minutes def build_timeout_in_minutes
build_timeout / 60 build_timeout / 60
end end
......
...@@ -20,6 +20,6 @@ ...@@ -20,6 +20,6 @@
%th Coverage %th Coverage
%th %th
= render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, pipeline_link: true, stage: true, allow_retry: true, coverage: admin || project.build_coverage_enabled?, admin: admin } = render partial: "projects/ci/builds/build", collection: builds, as: :build, locals: { commit_sha: true, ref: true, pipeline_link: true, stage: true, allow_retry: true, admin: admin }
= paginate builds, theme: 'gitlab' = paginate builds, theme: 'gitlab'
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
- retried = local_assigns.fetch(:retried, false) - retried = local_assigns.fetch(:retried, false)
- pipeline_link = local_assigns.fetch(:pipeline_link, false) - pipeline_link = local_assigns.fetch(:pipeline_link, false)
- stage = local_assigns.fetch(:stage, false) - stage = local_assigns.fetch(:stage, false)
- coverage = local_assigns.fetch(:coverage, false)
- allow_retry = local_assigns.fetch(:allow_retry, false) - allow_retry = local_assigns.fetch(:allow_retry, false)
%tr.build.commit{ class: ('retried' if retried) } %tr.build.commit{ class: ('retried' if retried) }
...@@ -88,7 +87,7 @@ ...@@ -88,7 +87,7 @@
%span= time_ago_with_tooltip(build.finished_at) %span= time_ago_with_tooltip(build.finished_at)
%td.coverage %td.coverage
- if coverage && build.try(:coverage) - if build.try(:coverage)
#{build.coverage}% #{build.coverage}%
%td %td
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
%th Job ID %th Job ID
%th Name %th Name
%th %th
- if pipeline.project.build_coverage_enabled?
%th Coverage %th Coverage
%th %th
= render partial: "projects/stage/stage", collection: pipeline.stages, as: :stage = render partial: "projects/stage/stage", collection: pipeline.stages, as: :stage
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
- retried = local_assigns.fetch(:retried, false) - retried = local_assigns.fetch(:retried, false)
- pipeline_link = local_assigns.fetch(:pipeline_link, false) - pipeline_link = local_assigns.fetch(:pipeline_link, false)
- stage = local_assigns.fetch(:stage, false) - stage = local_assigns.fetch(:stage, false)
- coverage = local_assigns.fetch(:coverage, false)
%tr.generic_commit_status{ class: ('retried' if retried) } %tr.generic_commit_status{ class: ('retried' if retried) }
%td.status %td.status
...@@ -80,7 +79,7 @@ ...@@ -80,7 +79,7 @@
%span= time_ago_with_tooltip(generic_commit_status.finished_at) %span= time_ago_with_tooltip(generic_commit_status.finished_at)
%td.coverage %td.coverage
- if coverage && generic_commit_status.try(:coverage) - if generic_commit_status.try(:coverage)
#{generic_commit_status.coverage}% #{generic_commit_status.coverage}%
%td %td
......
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
%th Job ID %th Job ID
%th Name %th Name
%th %th
- if pipeline.project.build_coverage_enabled?
%th Coverage %th Coverage
%th %th
= render partial: "projects/stage/stage", collection: pipeline.stages, as: :stage = render partial: "projects/stage/stage", collection: pipeline.stages, as: :stage
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
= ci_icon_for_status(stage.status) = ci_icon_for_status(stage.status)
&nbsp; &nbsp;
= stage.name.titleize = stage.name.titleize
= render stage.statuses.latest_ordered, coverage: @project.build_coverage_enabled?, stage: false, ref: false, pipeline_link: false, allow_retry: true = render stage.statuses.latest_ordered, stage: false, ref: false, pipeline_link: false, allow_retry: true
= render stage.statuses.retried_ordered, coverage: @project.build_coverage_enabled?, stage: false, ref: false, pipeline_link: false, retried: true = render stage.statuses.retried_ordered, stage: false, ref: false, pipeline_link: false, retried: true
%tr %tr
%td{ colspan: 10 } %td{ colspan: 10 }
&nbsp; &nbsp;
---
title: Show the build/pipeline coverage if it is available
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment