about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYamagishi Kazutoshi <ykzts@desire.sh>2018-05-09 23:59:58 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-05-09 16:59:58 +0200
commitac788ad47e32a3cf84a46ac87f84f376185cdad4 (patch)
tree1f67a937f71e15ee4826446ec9531fd6aaf7f4fb
parentedf882320a12b2c0cfa7fc0fb7eafaa39021cb0f (diff)
Disable simplecov on CircleCI (#7416)
* Disable simplecov on CircleCI

* Remove --format progress
-rw-r--r--.circleci/config.yml1
-rw-r--r--spec/spec_helper.rb13
2 files changed, 8 insertions, 6 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index fc9c7e22b..02b505457 100644
--- 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 a0466dd4b..0cd1f91d0 100644
--- 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