summaryrefslogtreecommitdiff
path: root/scripts/merge-simplecov
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2019-02-28 19:57:34 +0100
committerToon Claes <toon@gitlab.com>2019-02-28 19:57:34 +0100
commit62d7990b9bb30cf33ed87017c5c633d1cccc75c2 (patch)
treec3e1b69c58a412ba1c6f50a0337a23d9f9d6e1a4 /scripts/merge-simplecov
parentf6453eca992a9c142268e78ac782cef98110d183 (diff)
downloadgitlab-ce-tc-standard-gem.tar.gz
Ran standardrb --fix on the whole codebasetc-standard-gem
Inspired by https://twitter.com/searls/status/1101137953743613952 I decided to try https://github.com/testdouble/standard on our codebase. It's opinionated, but at least it's a _standard_.
Diffstat (limited to 'scripts/merge-simplecov')
-rwxr-xr-xscripts/merge-simplecov12
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/merge-simplecov b/scripts/merge-simplecov
index 65f93f8830b..31ac6abc35d 100755
--- a/scripts/merge-simplecov
+++ b/scripts/merge-simplecov
@@ -1,22 +1,20 @@
#!/usr/bin/env ruby
-require_relative '../spec/simplecov_env'
+require_relative "../spec/simplecov_env"
SimpleCovEnv.configure_profile
module SimpleCov
module ResultMerger
class << self
def resultset_files
- Dir.glob(File.join(SimpleCov.coverage_path, '*', '.resultset.json'))
+ Dir.glob(File.join(SimpleCov.coverage_path, "*", ".resultset.json"))
end
def resultset_hashes
resultset_files.map do |path|
- begin
- JSON.parse(File.read(path))
- rescue
- {}
- end
+ JSON.parse(File.read(path))
+ rescue
+ {}
end
end