Use custom test-queue runner for DB isolation and SimpleCov

Author: crmne

.github/workflows/_test-matrix.yml

@@ -54,14 +54,14 @@ jobs:
 
       - name: Run tests
         if: matrix.ruby-version != '4.0' || matrix.rails-version != 'rails-8.1'
-        run: bundle exec appraisal ${{ matrix.rails-version }} rspec-queue
+        run: bundle exec appraisal ${{ matrix.rails-version }} bin/rspec-queue
         env:
           SPEC_OPTS: --tag ~generator
           SKIP_COVERAGE: true
 
       - name: Run full test suite with coverage (latest Ruby/Rails)
         if: matrix.ruby-version == '4.0' && matrix.rails-version == 'rails-8.1'
-        run: bundle exec appraisal ${{ matrix.rails-version }} rspec
+        run: bundle exec appraisal ${{ matrix.rails-version }} bin/rspec-queue
 
       - name: Upload coverage to Codecov
         if: matrix.ruby-version == '4.0' && matrix.rails-version == 'rails-8.1'
@@ -77,7 +77,7 @@ jobs:
         run: |
           FARADAY_VERSION=1.10.3 bundle install
           bundle exec appraisal ${{ matrix.rails-version }} bundle install
-          bundle exec appraisal ${{ matrix.rails-version }} rspec-queue
+          bundle exec appraisal ${{ matrix.rails-version }} bin/rspec-queue
         env:
           SPEC_OPTS: --tag ~generator
           SKIP_COVERAGE: true

.overcommit.yml

@@ -10,7 +10,7 @@ PreCommit:
   RSpec:
     enabled: true
     command: [
-      'bundle', 'exec', 'rspec-queue',
+      'bundle', 'exec', 'bin/rspec-queue',
       '--tag', '~generator'
     ]
     on_warn: fail

bin/rspec-queue

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+ENV['TEST_ENV_NUMBER'] = '0' if ENV.fetch('TEST_ENV_NUMBER', '').empty?
+
+require 'bundler/setup'
+require 'test_queue'
+require 'test_queue/runner/rspec'
+require 'simplecov'
+
+class RubyLLMRSpecQueueRunner < TestQueue::Runner::RSpec
+  def after_fork(num)
+    super
+    ENV['TEST_ENV_NUMBER'] = num.to_s
+    return if ENV['SKIP_COVERAGE']
+    return unless defined?(SimpleCov) && SimpleCov.running
+
+    SimpleCov.command_name("RSpec worker #{num}")
+  end
+
+  def cleanup_worker
+    return unless defined?(SimpleCov) && SimpleCov.running
+
+    SimpleCov.result
+  end
+end
+
+runner = RubyLLMRSpecQueueRunner.new
+runner.exit_when_done = false
+exit_status = runner.execute
+
+if !ENV['SKIP_COVERAGE'] && defined?(SimpleCov) && SimpleCov.running
+  SimpleCov.result.format!
+end
+
+exit exit_status

lib/tasks/ruby_llm.rake

@@ -5,7 +5,7 @@ def run_test_queue_rspec
   env = {}
   env['TEST_QUEUE_WORKERS'] = workers if workers && !workers.empty? && ENV.fetch('TEST_QUEUE_WORKERS', '').empty?
 
-  system(env, 'bundle', 'exec', 'rspec-queue')
+  system(env, 'bundle', 'exec', 'bin/rspec-queue')
 end
 
 namespace :ruby_llm do