diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 23:02:30 +0300 |
commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /scripts/merge-simplecov | |
parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'scripts/merge-simplecov')
-rwxr-xr-x | scripts/merge-simplecov | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov index b74a416a6e0..32a0cd86f82 100755 --- a/scripts/merge-simplecov +++ b/scripts/merge-simplecov @@ -5,26 +5,4 @@ require_relative '../spec/simplecov_env' SimpleCovEnv.configure_profile SimpleCovEnv.configure_formatter -module SimpleCov - module ResultMerger - class << self - def resultset_files - Dir.glob(File.join(SimpleCov.coverage_path, '*', '.resultset.json')) - end - - def resultset_hashes - resultset_files.map do |path| - JSON.parse(File.read(path)) - rescue StandardError - {} - end - end - - def resultset - resultset_hashes.reduce({}, :merge) - end - end - end -end - -SimpleCov::ResultMerger.merged_result.format! +SimpleCov.collate Dir.glob(File.join(SimpleCov.coverage_path, '*', '.resultset.json')) |