Disable simplecov on CircleCI (#7416)

* Disable simplecov on CircleCI

* Remove --format progress

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fc9c7e22b7ce1d2a829749da7373efb95aaa1de1..02b505457bb8dad4e27f503a421e78c7a1bf238a 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,6 +11,7 @@ aliases:
           RAILS_ENV: test
           PARALLEL_TEST_PROCESSORS: 4
           ALLOW_NOPAM: true
+          DISABLE_SIMPLECOV: true
     working_directory: ~/projects/mastodon/
 
   - &attach_workspace

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a0466dd4bf875c0bacd26e980c079aaa33851de8..0cd1f91d021521f7756efc86d8270bbe826551b3 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1,12 @@
-require 'simplecov'
-
 GC.disable
 
-SimpleCov.start 'rails' do
-  add_group 'Services', 'app/services'
-  add_group 'Presenters', 'app/presenters'
-  add_group 'Validators', 'app/validators'
+if ENV['DISABLE_SIMPLECOV'] != 'true'
+  require 'simplecov'
+  SimpleCov.start 'rails' do
+    add_group 'Services', 'app/services'
+    add_group 'Presenters', 'app/presenters'
+    add_group 'Validators', 'app/validators'
+  end
 end
 
 gc_counter = -1