Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Pin SimpleCov to 0.x and restore original coverage config (#14320)

Damian Legawieca29cb95dd7a9
diff --git a/spree/admin/spec/spec_helper.rb b/spree/admin/spec/spec_helper.rb
index f94876785a..7d9a8843c2 100644
--- a/spree/admin/spec/spec_helper.rb
+++ b/spree/admin/spec/spec_helper.rb
@@ -4,19 +4,19 @@ if ENV['COVERAGE']
SimpleCov.root(ENV.fetch('GITHUB_WORKSPACE', File.expand_path('../../..', __dir__)))
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
SimpleCov.start 'rails' do
- group 'Libraries', 'lib/spree'
-
- skip '/app/assets/'
- skip '/app/javascript/'
- skip '/app/views/'
- skip '/bin/'
- skip '/config/'
- skip '/db/'
- skip '/lib/generators/'
- skip '/lib/tasks/'
- skip '/script/'
- skip '/spec/'
- skip '/vendor/'
+ add_group 'Libraries', 'lib/spree'
+
+ add_filter '/app/assets/'
+ add_filter '/app/javascript/'
+ add_filter '/app/views/'
+ add_filter '/bin/'
+ add_filter '/config/'
+ add_filter '/db/'
+ add_filter '/lib/generators/'
+ add_filter '/lib/tasks/'
+ add_filter '/script/'
+ add_filter '/spec/'
+ add_filter '/vendor/'
suffix = [ENV.fetch('CI_SHARD', '1'), ENV['TEST_ENV_NUMBER']].compact.reject(&:empty?).join('_')
if ENV['COVERAGE_DIR']
diff --git a/spree/api/spec/spec_helper.rb b/spree/api/spec/spec_helper.rb
index d770c25254..ae0c4a05b9 100644
--- a/spree/api/spec/spec_helper.rb
+++ b/spree/api/spec/spec_helper.rb
@@ -4,15 +4,15 @@ if ENV['COVERAGE']
SimpleCov.root(ENV.fetch('GITHUB_WORKSPACE', File.expand_path('../../..', __dir__)))
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
SimpleCov.start 'rails' do
- group 'Serializers', 'app/serializers'
- group 'Libraries', 'lib/spree'
-
- skip '/bin/'
- skip '/config/'
- skip '/db/'
- skip '/lib/spree/api/testing_support/'
- skip '/script/'
- skip '/spec/'
+ add_group 'Serializers', 'app/serializers'
+ add_group 'Libraries', 'lib/spree'
+
+ add_filter '/bin/'
+ add_filter '/config/'
+ add_filter '/db/'
+ add_filter '/lib/spree/api/testing_support/'
+ add_filter '/script/'
+ add_filter '/spec/'
suffix = [ENV.fetch('CI_SHARD', '1'), ENV['TEST_ENV_NUMBER']].compact.reject(&:empty?).join('_')
if ENV['COVERAGE_DIR']
diff --git a/spree/common_spree_dependencies.rb b/spree/common_spree_dependencies.rb
index 722579ce25..bd52384d00 100644
--- a/spree/common_spree_dependencies.rb
+++ b/spree/common_spree_dependencies.rb
@@ -34,7 +34,10 @@ group :test do
gem 'rspec_junit_formatter'
gem 'rswag-specs'
gem 'jsonapi-rspec'
- gem 'simplecov'
+ # Pinned to 0.x: SimpleCov 1.0 changed how parallel/sharded coverage results
+ # merge, dropping covered files from the report (e.g. a tested helper shown at
+ # 0%) and deflating the reported total. Stay on 0.x until that's resolved.
+ gem 'simplecov', '~> 0.22.0'
gem 'simplecov-cobertura'
gem 'stackprof'
gem 'webmock'
diff --git a/spree/core/spec/spec_helper.rb b/spree/core/spec/spec_helper.rb
index 8c60743cd0..d13f84d5a8 100644
--- a/spree/core/spec/spec_helper.rb
+++ b/spree/core/spec/spec_helper.rb
@@ -4,26 +4,26 @@ if ENV['COVERAGE']
SimpleCov.root(ENV.fetch('GITHUB_WORKSPACE', File.expand_path('../../..', __dir__)))
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
SimpleCov.start 'rails' do
- group 'Finders', 'app/finders'
- group 'Mailers', 'app/mailers'
- group 'Paginators', 'app/paginators'
- group 'Services', 'app/services'
- group 'Sorters', 'app/sorters'
- group 'Validators', 'app/validators'
- group 'Libraries', 'lib/spree'
-
- skip '/app/assets/'
- skip '/app/javascript/'
- skip '/app/views/'
- skip '/bin/'
- skip '/config/'
- skip '/db/'
- skip '/lib/generators/'
- skip '/lib/spree/testing_support/'
- skip '/lib/tasks/'
- skip '/script/'
- skip '/spec/'
- skip '/vendor/'
+ add_group 'Finders', 'app/finders'
+ add_group 'Mailers', 'app/mailers'
+ add_group 'Paginators', 'app/paginators'
+ add_group 'Services', 'app/services'
+ add_group 'Sorters', 'app/sorters'
+ add_group 'Validators', 'app/validators'
+ add_group 'Libraries', 'lib/spree'
+
+ add_filter '/app/assets/'
+ add_filter '/app/javascript/'
+ add_filter '/app/views/'
+ add_filter '/bin/'
+ add_filter '/config/'
+ add_filter '/db/'
+ add_filter '/lib/generators/'
+ add_filter '/lib/spree/testing_support/'
+ add_filter '/lib/tasks/'
+ add_filter '/script/'
+ add_filter '/spec/'
+ add_filter '/vendor/'
# CI_SHARD distinguishes runners; TEST_ENV_NUMBER distinguishes the parallel
# rspec processes within a runner — both are needed so concurrent processes
diff --git a/spree/dashboard/spec/spec_helper.rb b/spree/dashboard/spec/spec_helper.rb
index 5fd57ca6bc..05ac8350c3 100644
--- a/spree/dashboard/spec/spec_helper.rb
+++ b/spree/dashboard/spec/spec_helper.rb
@@ -4,20 +4,20 @@ if ENV['COVERAGE']
SimpleCov.root(ENV.fetch('GITHUB_WORKSPACE', File.expand_path('../../..', __dir__)))
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
SimpleCov.start 'rails' do
- group 'Models', 'app/models'
- group 'Mailers', 'app/mailers'
- group 'Helpers', 'app/helpers'
+ add_group 'Models', 'app/models'
+ add_group 'Mailers', 'app/mailers'
+ add_group 'Helpers', 'app/helpers'
- skip '/app/assets/'
- skip '/app/views/'
- skip '/bin/'
- skip '/config/'
- skip '/db/'
- skip '/lib/generators/'
- skip '/lib/spree/testing_support/'
- skip '/lib/tasks/'
- skip '/script/'
- skip '/spec/'
+ add_filter '/app/assets/'
+ add_filter '/app/views/'
+ add_filter '/bin/'
+ add_filter '/config/'
+ add_filter '/db/'
+ add_filter '/lib/generators/'
+ add_filter '/lib/spree/testing_support/'
+ add_filter '/lib/tasks/'
+ add_filter '/script/'
+ add_filter '/spec/'
suffix = [ENV.fetch('CI_SHARD', '1'), ENV['TEST_ENV_NUMBER']].compact.reject(&:empty?).join('_')
if ENV['COVERAGE_DIR']
diff --git a/spree/emails/spec/spec_helper.rb b/spree/emails/spec/spec_helper.rb
index 84b0e5b1fe..6a790aba99 100644
--- a/spree/emails/spec/spec_helper.rb
+++ b/spree/emails/spec/spec_helper.rb
@@ -4,20 +4,20 @@ if ENV['COVERAGE']
SimpleCov.root(ENV.fetch('GITHUB_WORKSPACE', File.expand_path('../../..', __dir__)))
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
SimpleCov.start 'rails' do
- group 'Models', 'app/models'
- group 'Mailers', 'app/mailers'
- group 'Helpers', 'app/helpers'
+ add_group 'Models', 'app/models'
+ add_group 'Mailers', 'app/mailers'
+ add_group 'Helpers', 'app/helpers'
- skip '/app/assets/'
- skip '/app/views/'
- skip '/bin/'
- skip '/config/'
- skip '/db/'
- skip '/lib/generators/'
- skip '/lib/spree/testing_support/'
- skip '/lib/tasks/'
- skip '/script/'
- skip '/spec/'
+ add_filter '/app/assets/'
+ add_filter '/app/views/'
+ add_filter '/bin/'
+ add_filter '/config/'
+ add_filter '/db/'
+ add_filter '/lib/generators/'
+ add_filter '/lib/spree/testing_support/'
+ add_filter '/lib/tasks/'
+ add_filter '/script/'
+ add_filter '/spec/'
suffix = [ENV.fetch('CI_SHARD', '1'), ENV['TEST_ENV_NUMBER']].compact.reject(&:empty?).join('_')
if ENV['COVERAGE_DIR']