Fix: simplecov integration for coverage

Gemfile

@@ -79,8 +79,7 @@ group :test do
   gem 'resque_spec'
   gem 'selenium-webdriver', '3.141.0' # locked until we upgrade to capybara 3.x
   gem 'shoulda-matchers', require: false
-  gem 'simplecov'
-  gem 'simplecov-rcov'
+  gem 'simplecov', require: false
   gem 'spring-commands-rspec'
   gem 'timecop'
 end

Gemfile.lock

@@ -376,8 +376,6 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    simplecov-rcov (0.3.3)
-      simplecov (>= 0.4.1)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
@@ -480,7 +478,6 @@ DEPENDENCIES
   selenium-webdriver (= 3.141.0)
   shoulda-matchers
   simplecov
-  simplecov-rcov
   spring-commands-rspec
   timecop
   treetop (= 1.4.15)

spec/spec_helper.rb

@@ -1,17 +1,22 @@
 if ENV["COVERAGE"]
   require 'simplecov'
-  require 'simplecov-rcov'
-  class SimpleCov::Formatter::MergedFormatter
-    def format(result)
-       SimpleCov::Formatter::HTMLFormatter.new.format(result)
-       SimpleCov::Formatter::RcovFormatter.new.format(result)
-    end
-  end
-  SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+  SimpleCov.formatter SimpleCov::Formatter::SimpleFormatter if ENV['CI']
+
   SimpleCov.start do
-    add_filter "/spec/"
-    add_filter "/.bundle/"
-    add_filter "/lib/treetop/command.rb"
+    load_profile "test_frameworks"
+
+    add_filter %r{^/config/}
+    add_filter %r{^/db/}
+
+    add_group "Controllers", ["app/controllers"] + Dir["plugins/*/controllers"]
+    # add_group "Channels", ["app/channels"] + Dir["plugins/*/channels"]
+    add_group "Models", ["app/models"] + Dir["plugins/*/models"]
+    add_group "Mailers", ["app/mailers"] + Dir["plugins/*/mailers"]
+    add_group "Helpers", ["app/helpers"] + Dir["plugins/*/helpers"]
+    add_group "Jobs", %w[app/jobs app/workers] + Dir["plugins/*/{jobs,workers}"]
+    add_group "Libraries", ["lib/"] + Dir["plugins/*/lib"]
+
+    track_files "{app,lib}/**/*.rb"
   end
 end
 
@@ -49,7 +54,7 @@ def format(result)
   config.define_derived_metadata(:file_path => /spec\/integration/) do |metadata|
     metadata[:type] ||= :integration
   end
-  config.filter_run_excluding(js: true)   unless config.filter_manager.inclusions[:js]
+  config.filter_run_excluding(js: true) unless config.filter_manager.inclusions[:js] || ENV["FEATURES"]
 
   Warden.test_mode!