Update configuration of SimpleCov

1 files changed, 22 insertions, 13 deletions

diff --git a/spec/simplecov_env.rb b/spec/simplecov_env.rb
index a833255d407..956476fd065 100644
--- a/spec/simplecov_env.rb
+++ b/spec/simplecov_env.rb
@@ -1,18 +1,27 @@
-if ENV['SIMPLECOV']
-  require 'simplecov'
+require 'simplecov'
 
-  SimpleCov.start :rails do
-    if ENV['CI_BUILD_NAME']
-      coverage_dir "coverage/#{ENV['CI_BUILD_NAME']}"
-      command_name ENV['CI_BUILD_NAME']
-      merge_timeout 7200
-    end
+SimpleCov.configure do
+  load_profile :rails
 
-    add_filter '/vendor/ruby/'
+  if ENV['CI_BUILD_NAME']
+    coverage_dir "coverage/#{ENV['CI_BUILD_NAME']}"
+    command_name ENV['CI_BUILD_NAME']
+  end
 
-    add_group 'Services', 'app/services'
-    add_group 'Finders', 'app/finders'
-    add_group 'Uploaders', 'app/uploaders'
-    add_group 'Validators', 'app/validators'
+  if ENV['CI']
+    SimpleCov.at_exit do
+      # In CI environment don't generate formatted reports
+      # Only generate .resultset.json
+      SimpleCov.result
+    end
   end
+
+  add_filter '/vendor/ruby/'
+
+  add_group 'Services', 'app/services'
+  add_group 'Finders', 'app/finders'
+  add_group 'Uploaders', 'app/uploaders'
+  add_group 'Validators', 'app/validators'
+
+  merge_timeout 7200
 end