From a547dfff37ab89d6993e2c60783611a590a063ff Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Tue, 12 May 2026 09:12:49 -0400
Subject: [PATCH] Move flatware setup into rails_helper (#38944)

---
 .github/workflows/test-ruby.yml |  2 +-
 spec/flatware_helper.rb         | 12 ------------
 spec/rails_helper.rb            |  9 +++++++++
 3 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 spec/flatware_helper.rb

diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index b8c525d9d4..b8ff18fc0f 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.github/workflows/test-ruby.yml
@@ -163,7 +163,7 @@ jobs:
             rspec-persistence-main
             rspec-persistence
 
-      - run: bin/flatware rspec -r ./spec/flatware_helper.rb
+      - run: bin/flatware rspec
 
       - name: Upload coverage reports to Codecov
         if: matrix.ruby-version == '.ruby-version'
diff --git a/spec/flatware_helper.rb b/spec/flatware_helper.rb
deleted file mode 100644
index a1bcb62340..0000000000
--- a/spec/flatware_helper.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-if defined?(Flatware)
-  Flatware.configure do |config|
-    config.after_fork do |test_env_number|
-      if ENV.fetch('COVERAGE', false)
-        require 'simplecov'
-        SimpleCov.at_fork.call(test_env_number) # Combines parallel coverage results
-      end
-    end
-  end
-end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 3e11cc6dfc..c3a6e9b2d5 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -6,6 +6,9 @@ if ENV.fetch('COVERAGE', false)
   require 'simplecov'
 
   SimpleCov.start 'rails' do
+    # During parallel runs, ensure unique names for post-run merge
+    command_name "job-#{ENV['TEST_ENV_NUMBER']}" if ENV['TEST_ENV_NUMBER']
+
     if ENV['CI']
       require 'simplecov-lcov'
       formatter SimpleCov::Formatter::LcovFormatter
@@ -26,6 +29,12 @@ if ENV.fetch('COVERAGE', false)
     add_group 'Services', 'app/services'
     add_group 'Validators', 'app/validators'
   end
+
+  if defined?(Flatware)
+    Flatware.configure do |config|
+      config.after_fork { |test| SimpleCov.at_fork.call(test) } # Combines parallel coverage results
+    end
+  end
 end
 
 # This needs to be defined before Rails is initialized