From f2a834e548c840d4f85058971c4fae454eecc73b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Jul 2026 15:30:41 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump simplecov from 0.22.0 to 1.0.2 Bumps [simplecov](https://github.com/simplecov-ruby/simplecov) from 0.22.0 to 1.0.2. - [Release notes](https://github.com/simplecov-ruby/simplecov/releases) - [Changelog](https://github.com/simplecov-ruby/simplecov/blob/main/CHANGELOG.md) - [Commits](https://github.com/simplecov-ruby/simplecov/compare/v0.22.0...v1.0.2) --- updated-dependencies: - dependency-name: simplecov dependency-version: 1.0.1 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4c1b1349a..f26fefb8b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,7 +185,6 @@ GEM activerecord (>= 3.0, < 9.0) delayed_job (>= 3.0, < 5) diff-lcs (1.6.2) - docile (1.4.0) drb (2.2.3) email_validator (2.2.4) activemodel @@ -544,13 +543,8 @@ GEM simple_form (5.4.1) actionpack (>= 7.0) activemodel (>= 7.0) - simplecov (0.22.0) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-html (0.12.3) + simplecov (1.0.2) simplecov-lcov (0.9.0) - simplecov_json_formatter (0.1.4) sitemap_generator (7.1.0) builder (~> 3.0) slop (3.6.0) @@ -779,7 +773,6 @@ CHECKSUMS delayed_job (4.2.0) sha256=51dc1f68bb9084398317884c2178debd38c13a7eb48d8aa4ff4775465d7713ef delayed_job_active_record (4.1.11) sha256=64f34a6d50316dd7a7df1daf7c6e04ad888c0e86938762318f6f52522b7c1ba8 diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962 - docile (1.4.0) sha256=5f1734bde23721245c20c3d723e76c104208e1aa01277a69901ce770f0ebb8d3 drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373 email_validator (2.2.4) sha256=5ab238095bec7aef9389f230e9e0c64c5081cdf91f19d6c5cecee0a93af20604 erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9 @@ -920,10 +913,8 @@ CHECKSUMS semantic_logger (5.0.0) sha256=54b189860f28b205227cf269444219cf3fd0225736e3324b4596df4ec6a20f80 shoulda-matchers (8.0.1) sha256=5dbb46e5765b9da225111b085e0819e8c8a121ff94bba430a153eb1ea2c60288 simple_form (5.4.1) sha256=58c3d229034c7e5545035c3271b6f030ef730c340b9d7d8eb730e0a385b20808 - simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5 - simplecov-html (0.12.3) sha256=4b1aad33259ffba8b29c6876c12db70e5750cb9df829486e4c6e5da4fa0aa07b + simplecov (1.0.2) sha256=c6459434efe4b948b46477cc2df2faa73ab365f83a33c7c17f81262f4f7f1244 simplecov-lcov (0.9.0) sha256=7a77a31e200a595ed4b0249493056efd0c920601f53d2ef135ca34ee796346cd - simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428 sitemap_generator (7.1.0) sha256=5e493e67e8846b2a2ffc72799ff0f4a71db6c11c1269f7a9ae3433f40ec0af92 slop (3.6.0) sha256=76ccab03be66bfcab4838cdc07cab019cd3e192a3538266246749e79e4788803 snaky_hash (2.0.6) sha256=3663cae48cdef582b517025cf8a39d8789996eaf0b4ed89e2f0624836505654a From 4fe831c79a12cff44be098cdffa3e110194c3bb3 Mon Sep 17 00:00:00 2001 From: Morgan Roderick Date: Sat, 25 Jul 2026 17:40:30 +0200 Subject: [PATCH 2/3] chore(simplecov): remove branch_coverage? monkeypatch SimpleCov 1.0.2 provides branch_coverage? natively, so the compatibility shim for simplecov-lcov is no longer needed. --- spec/spec_helper.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index cea94c169..080939562 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,17 +4,6 @@ require 'webmock/rspec' if ENV['COVERAGE'] == 'true' - # Fix incompatibility of simplecov-lcov with older versions of simplecov that are not expresses in its gemspec. - # https://github.com/fortissimo1997/simplecov-lcov/pull/25 - - if !SimpleCov.respond_to?(:branch_coverage) - module SimpleCov - def self.branch_coverage? - false - end - end - end - SimpleCov::Formatter::LcovFormatter.config do |c| c.report_with_single_file = true c.single_report_path = 'coverage/lcov.info' From a977a6e2a8988b7fb8e852ce0d527418cd584343 Mon Sep 17 00:00:00 2001 From: Morgan Roderick Date: Sat, 25 Jul 2026 17:41:28 +0200 Subject: [PATCH 3/3] chore(simplecov): replace deprecated configuration methods Use `skip` instead of `add_filter` and `merging` instead of `use_merging`, matching the SimpleCov 1.0 configuration API. --- spec/spec_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 080939562..aa71649d9 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -17,20 +17,20 @@ ) SimpleCov.start do - add_filter 'spec/' + skip 'spec/' # Support parallel test execution # In CI: Use CI_NODE_INDEX (0, 1, 2, 3) set by GitHub Actions matrix # Locally: Use TEST_ENV_NUMBER ('', '2', '3', '4') set by parallel_tests if ENV['CI_NODE_INDEX'] command_name "RSpec-#{ENV['CI_NODE_INDEX']}" - use_merging true + merging true merge_timeout 3600 elsif ENV.key?('TEST_ENV_NUMBER') # TEST_ENV_NUMBER is '' for first process, '2', '3', etc. for others suffix = ENV['TEST_ENV_NUMBER'].empty? ? '1' : ENV['TEST_ENV_NUMBER'] command_name "RSpec-#{suffix}" - use_merging true + merging true merge_timeout 3600 end end