Skip to content

Commit a87c01a

Browse files
committed
Switch test runs to test-queue and keep rspec for coverage
1 parent 404a270 commit a87c01a

12 files changed

Lines changed: 23 additions & 19 deletions

File tree

.github/workflows/_test-matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@ jobs:
5454
5555
- name: Run tests
5656
if: matrix.ruby-version != '4.0' || matrix.rails-version != 'rails-8.1'
57-
run: bundle exec appraisal ${{ matrix.rails-version }} parallel_rspec
57+
run: bundle exec appraisal ${{ matrix.rails-version }} rspec-queue
5858
env:
5959
SPEC_OPTS: --tag ~generator
6060
SKIP_COVERAGE: true
6161

6262
- name: Run full test suite with coverage (latest Ruby/Rails)
6363
if: matrix.ruby-version == '4.0' && matrix.rails-version == 'rails-8.1'
64-
run: bundle exec appraisal ${{ matrix.rails-version }} parallel_rspec
64+
run: bundle exec appraisal ${{ matrix.rails-version }} rspec
6565

6666
- name: Upload coverage to Codecov
6767
if: matrix.ruby-version == '4.0' && matrix.rails-version == 'rails-8.1'
@@ -77,7 +77,7 @@ jobs:
7777
run: |
7878
FARADAY_VERSION=1.10.3 bundle install
7979
bundle exec appraisal ${{ matrix.rails-version }} bundle install
80-
bundle exec appraisal ${{ matrix.rails-version }} parallel_rspec
80+
bundle exec appraisal ${{ matrix.rails-version }} rspec-queue
8181
env:
8282
SPEC_OPTS: --tag ~generator
8383
SKIP_COVERAGE: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/test/version_tmp/
1111
/tmp/
1212
.rspec_status*
13+
.test_queue_stats
1314

1415
# Used by dotenv library to load environment variables.
1516
.env

.overcommit.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ PreCommit:
1010
RSpec:
1111
enabled: true
1212
command: [
13-
'bundle', 'exec', 'parallel_rspec',
14-
'--serialize-stdout',
15-
'--prefix-output-with-test-env-number',
16-
'--verbose-rerun-command',
17-
'--test-options', '--tag ~generator'
13+
'bundle', 'exec', 'rspec-queue',
14+
'--tag', '~generator'
1815
]
1916
on_warn: fail
2017

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ group :development do # rubocop:disable Metrics/BlockLength
1717
gem 'json-schema'
1818
gem 'nokogiri'
1919
gem 'overcommit', '>= 0.66'
20-
gem 'parallel_tests'
2120
gem 'pry', '>= 0.14'
2221
gem 'rails'
2322
gem 'rake', '>= 13.0'
@@ -29,6 +28,7 @@ group :development do # rubocop:disable Metrics/BlockLength
2928
gem 'rubocop-rspec'
3029
gem 'simplecov', '>= 0.21'
3130
gem 'simplecov-cobertura'
31+
gem 'test-queue'
3232

3333
# database drivers for MRI and JRuby
3434
gem 'activerecord-jdbcsqlite3-adapter', platform: 'jruby'

Rakefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ require 'rake/clean'
66

77
Dir.glob('lib/tasks/**/*.rake').each { |r| load r }
88

9+
desc 'Run test suite with rspec-queue'
10+
task :test do
11+
run_test_queue_rspec || abort('Tests failed')
12+
end
13+
914
desc 'Run overcommit hooks and update models'
1015
task :default do
1116
sh 'overcommit --run'

gemfiles/rails_7.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ group :development do
1515
gem "json-schema"
1616
gem "nokogiri"
1717
gem "overcommit", ">= 0.66"
18-
gem "parallel_tests"
1918
gem "pry", ">= 0.14"
19+
gem "test-queue"
2020
gem "rails", "~> 7.1.0"
2121
gem "rake", ">= 13.0"
2222
gem "reline"

gemfiles/rails_7.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ group :development do
1515
gem "json-schema"
1616
gem "nokogiri"
1717
gem "overcommit", ">= 0.66"
18-
gem "parallel_tests"
1918
gem "pry", ">= 0.14"
19+
gem "test-queue"
2020
gem "rails", "~> 7.2.0"
2121
gem "rake", ">= 13.0"
2222
gem "reline"

gemfiles/rails_8.0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ group :development do
1515
gem "json-schema"
1616
gem "nokogiri"
1717
gem "overcommit", ">= 0.66"
18-
gem "parallel_tests"
1918
gem "pry", ">= 0.14"
19+
gem "test-queue"
2020
gem "rails", "~> 8.0.0"
2121
gem "rake", ">= 13.0"
2222
gem "reline"

gemfiles/rails_8.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ group :development do
1515
gem "json-schema"
1616
gem "nokogiri"
1717
gem "overcommit", ">= 0.66"
18-
gem "parallel_tests"
1918
gem "pry", ">= 0.14"
19+
gem "test-queue"
2020
gem "rails", "~> 8.1.0"
2121
gem "rake", ">= 13.0"
2222
gem "reline"

lib/tasks/release.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace :release do # rubocop:disable Metrics/BlockLength
2626
if stale_count.positive?
2727
puts "\n🗑️ Removed #{stale_count} stale cassettes"
2828
puts '🔄 Re-recording cassettes...'
29-
run_parallel_rspec || exit(1)
29+
run_test_queue_rspec || exit(1)
3030
puts '✅ Cassettes refreshed!'
3131
else
3232
puts '✅ No stale cassettes found'

0 commit comments

Comments
 (0)