summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLukas Eipert <leipert@gitlab.com>2018-06-27 18:53:38 +0200
committerLukas Eipert <leipert@gitlab.com>2018-06-28 00:37:05 +0200
commit8550f9582b912625f4892223fdbcd3a946dd0bd5 (patch)
treeaffa3b7d1130e36cec172cad0602274cd5f4dccf /scripts
parentf63e234b57e07e2020f9698f48c9515905d4b6a3 (diff)
downloadgitlab-ce-leipert-more-coverage-reports.tar.gz
add more coverage resultsleipert-more-coverage-reports
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/merge-simplecov7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov
index 65f93f8830b..046456e2844 100755
--- a/scripts/merge-simplecov
+++ b/scripts/merge-simplecov
@@ -3,6 +3,13 @@
require_relative '../spec/simplecov_env'
SimpleCovEnv.configure_profile
+require 'simplecov-json'
+
+SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new([
+ SimpleCov::Formatter::HTMLFormatter,
+ SimpleCov::Formatter::JSONFormatter
+])
+
module SimpleCov
module ResultMerger
class << self