Switch coverage generation default to false, allow opt in with `COVERAGE` env var (#33824)
This commit is contained in:
		
							parent
							
								
									5212cd43ec
								
							
						
					
					
						commit
						95caa8bc4e
					
				|  | @ -64,7 +64,6 @@ jobs: | ||||||
|       DB_HOST: localhost |       DB_HOST: localhost | ||||||
|       DB_USER: postgres |       DB_USER: postgres | ||||||
|       DB_PASS: postgres |       DB_PASS: postgres | ||||||
|       DISABLE_SIMPLECOV: true |  | ||||||
|       RAILS_ENV: test |       RAILS_ENV: test | ||||||
|       BUNDLE_CLEAN: true |       BUNDLE_CLEAN: true | ||||||
|       BUNDLE_FROZEN: true |       BUNDLE_FROZEN: true | ||||||
|  |  | ||||||
|  | @ -107,7 +107,7 @@ jobs: | ||||||
|       DB_HOST: localhost |       DB_HOST: localhost | ||||||
|       DB_USER: postgres |       DB_USER: postgres | ||||||
|       DB_PASS: postgres |       DB_PASS: postgres | ||||||
|       DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }} |       COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }} | ||||||
|       RAILS_ENV: test |       RAILS_ENV: test | ||||||
|       ALLOW_NOPAM: true |       ALLOW_NOPAM: true | ||||||
|       PAM_ENABLED: true |       PAM_ENABLED: true | ||||||
|  | @ -208,7 +208,7 @@ jobs: | ||||||
|       DB_HOST: localhost |       DB_HOST: localhost | ||||||
|       DB_USER: postgres |       DB_USER: postgres | ||||||
|       DB_PASS: postgres |       DB_PASS: postgres | ||||||
|       DISABLE_SIMPLECOV: ${{ matrix.ruby-version != '.ruby-version' }} |       COVERAGE: ${{ matrix.ruby-version == '.ruby-version' }} | ||||||
|       RAILS_ENV: test |       RAILS_ENV: test | ||||||
|       ALLOW_NOPAM: true |       ALLOW_NOPAM: true | ||||||
|       PAM_ENABLED: true |       PAM_ENABLED: true | ||||||
|  | @ -295,7 +295,6 @@ jobs: | ||||||
|       DB_HOST: localhost |       DB_HOST: localhost | ||||||
|       DB_USER: postgres |       DB_USER: postgres | ||||||
|       DB_PASS: postgres |       DB_PASS: postgres | ||||||
|       DISABLE_SIMPLECOV: true |  | ||||||
|       RAILS_ENV: test |       RAILS_ENV: test | ||||||
|       BUNDLE_WITH: test |       BUNDLE_WITH: test | ||||||
|       LOCAL_DOMAIN: localhost:3000 |       LOCAL_DOMAIN: localhost:3000 | ||||||
|  | @ -411,7 +410,6 @@ jobs: | ||||||
|       DB_HOST: localhost |       DB_HOST: localhost | ||||||
|       DB_USER: postgres |       DB_USER: postgres | ||||||
|       DB_PASS: postgres |       DB_PASS: postgres | ||||||
|       DISABLE_SIMPLECOV: true |  | ||||||
|       RAILS_ENV: test |       RAILS_ENV: test | ||||||
|       BUNDLE_WITH: test |       BUNDLE_WITH: test | ||||||
|       ES_ENABLED: true |       ES_ENABLED: true | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								Gemfile
								
								
								
								
							
							
						
						
									
										2
									
								
								Gemfile
								
								
								
								
							|  | @ -156,7 +156,7 @@ group :test do | ||||||
| 
 | 
 | ||||||
|   gem 'shoulda-matchers' |   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', '~> 0.22', require: false | ||||||
|   gem 'simplecov-lcov', '~> 0.8', require: false |   gem 'simplecov-lcov', '~> 0.8', require: false | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ | ||||||
| if defined?(Flatware) | if defined?(Flatware) | ||||||
|   Flatware.configure do |config| |   Flatware.configure do |config| | ||||||
|     config.after_fork do |test_env_number| |     config.after_fork do |test_env_number| | ||||||
|       unless ENV.fetch('DISABLE_SIMPLECOV', nil) == 'true' |       if ENV.fetch('COVERAGE', false) | ||||||
|         require 'simplecov' |         require 'simplecov' | ||||||
|         SimpleCov.at_fork.call(test_env_number) # Combines parallel coverage results |         SimpleCov.at_fork.call(test_env_number) # Combines parallel coverage results | ||||||
|       end |       end | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ | ||||||
| 
 | 
 | ||||||
| ENV['RAILS_ENV'] ||= 'test' | ENV['RAILS_ENV'] ||= 'test' | ||||||
| 
 | 
 | ||||||
| unless ENV['DISABLE_SIMPLECOV'] == 'true' | if ENV.fetch('COVERAGE', false) | ||||||
|   require 'simplecov' |   require 'simplecov' | ||||||
| 
 | 
 | ||||||
|   SimpleCov.start 'rails' do |   SimpleCov.start 'rails' do | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue