diff --git a/.github/workflows/test-migrations.yml b/.github/workflows/test-migrations.yml index 306191fb8e..733664b753 100644 --- a/.github/workflows/test-migrations.yml +++ b/.github/workflows/test-migrations.yml @@ -64,7 +64,6 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres - DISABLE_SIMPLECOV: true RAILS_ENV: test BUNDLE_CLEAN: true BUNDLE_FROZEN: true diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index 4deb08d328..1f7f8f93a8 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -107,7 +107,7 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres - DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }} + COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }} RAILS_ENV: test ALLOW_NOPAM: true PAM_ENABLED: true @@ -208,7 +208,7 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres - DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }} + COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }} RAILS_ENV: test ALLOW_NOPAM: true PAM_ENABLED: true @@ -295,7 +295,6 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres - DISABLE_SIMPLECOV: true RAILS_ENV: test BUNDLE_WITH: test LOCAL_DOMAIN: localhost:3000 @@ -411,7 +410,6 @@ jobs: DB_HOST: localhost DB_USER: postgres DB_PASS: postgres - DISABLE_SIMPLECOV: true RAILS_ENV: test BUNDLE_WITH: test ES_ENABLED: true diff --git a/Gemfile b/Gemfile index 89648e8cac..ebfee9d784 100644 --- a/Gemfile +++ b/Gemfile @@ -156,7 +156,7 @@ group :test do gem 'shoulda-matchers' - # Coverage formatter for RSpec test if DISABLE_SIMPLECOV is false + # Coverage formatter for RSpec gem 'simplecov', '~> 0.22', require: false gem 'simplecov-lcov', '~> 0.8', require: false diff --git a/spec/flatware_helper.rb b/spec/flatware_helper.rb index 57a7c1f56a..a1bcb62340 100644 --- a/spec/flatware_helper.rb +++ b/spec/flatware_helper.rb @@ -3,7 +3,7 @@ if defined?(Flatware) Flatware.configure do |config| config.after_fork do |test_env_number| - unless ENV.fetch('DISABLE_SIMPLECOV', nil) == 'true' + if ENV.fetch('COVERAGE', false) require 'simplecov' SimpleCov.at_fork.call(test_env_number) # Combines parallel coverage results end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 6564f17372..7d63ea6300 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -2,7 +2,7 @@ ENV['RAILS_ENV'] ||= 'test' -unless ENV['DISABLE_SIMPLECOV'] == 'true' +if ENV.fetch('COVERAGE', false) require 'simplecov' SimpleCov.start 'rails' do