Skip to content

Commit 0788d0e

Browse files
authored
ruby 34 + remove 30 (#994)
* ruby 3.4 * rubocop * 32
1 parent 7c91535 commit 0788d0e

File tree

169 files changed

+278
-1416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+278
-1416
lines changed

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
strategy:
1313
fail-fast: false # run all tests so we see which gem/ruby combinations break
1414
matrix:
15-
ruby: ['3.0', '3.1', '3.2', '3.3', head, jruby-head]
15+
ruby: ['3.2', '3.3', '3.4', head, jruby-head]
1616
os: [ubuntu-latest, windows-latest]
1717
task: [spec]
1818
include:
19-
- ruby: '3.0' # lowest supported version, same as gemspec and .rubocop.yml
19+
- ruby: '3.2' # lowest supported version, same as gemspec and .rubocop.yml
2020
os: ubuntu-latest
2121
task: rubocop
2222
steps:

.rubocop.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AllCops:
22
NewCops: enable
3-
TargetRubyVersion: 3.0
3+
TargetRubyVersion: 3.2
44
SuggestExtensions: false
55
Exclude:
66
- '**/vendor/bundle/**/*'
@@ -135,3 +135,11 @@ Lint/EmptyClass:
135135
# ENV.fetch('FOO', nil) is the same as ENV['FOO']
136136
Style/FetchEnvVar:
137137
Enabled: false
138+
139+
# &block is pretty readable
140+
Naming/BlockForwarding:
141+
Enabled: false
142+
143+
# &block is pretty readable
144+
Style/ArgumentsForwarding:
145+
Enabled: false

Gemfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ gemspec
44

55
gem 'bump'
66
gem 'test-unit'
7-
gem 'minitest', '~> 5.5.0'
8-
gem 'rspec', '~> 3.3'
9-
gem 'cucumber', "~> 4.0"
10-
gem 'cuke_modeler', '~> 3.6'
7+
gem 'minitest'
8+
gem 'rspec'
9+
gem 'cucumber'
10+
gem 'cuke_modeler'
1111
gem 'spinach'
1212
gem 'racc' # need for spinach on 3.3+ https://github.com/codegram/spinach/issues/256
1313
gem 'rake'
14-
gem 'rubocop', '~> 1.51.0' # lock minor so we do not get accidental violations
14+
gem 'rubocop', '~> 1.73.1' # lock minor so we do not get accidental violations

Gemfile.lock

+78-99
Original file line numberDiff line numberDiff line change
@@ -7,117 +7,96 @@ PATH
77
GEM
88
remote: https://rubygems.org/
99
specs:
10-
activesupport (6.1.5)
11-
concurrent-ruby (~> 1.0, >= 1.0.2)
12-
i18n (>= 1.6, < 2)
13-
minitest (>= 5.1)
14-
tzinfo (~> 2.0)
15-
zeitwerk (~> 2.3)
1610
ast (2.4.2)
17-
builder (3.2.4)
11+
bigdecimal (3.1.9)
12+
bigdecimal (3.1.9-java)
13+
builder (3.3.0)
1814
bump (0.10.0)
1915
colorize (1.1.0)
20-
concurrent-ruby (1.1.10)
21-
cucumber (4.1.0)
22-
builder (~> 3.2, >= 3.2.3)
23-
cucumber-core (~> 7.1, >= 7.1.0)
24-
cucumber-create-meta (~> 1.0.0, >= 1.0.0)
25-
cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
26-
cucumber-gherkin (~> 14.0, >= 14.0.1)
27-
cucumber-html-formatter (~> 7.0, >= 7.0.0)
28-
cucumber-messages (~> 12.2, >= 12.2.0)
29-
cucumber-wire (~> 3.1, >= 3.1.0)
30-
diff-lcs (~> 1.3, >= 1.3, < 1.4)
31-
multi_test (~> 0.1, >= 0.1.2)
32-
sys-uname (~> 1.0, >= 1.0.2)
33-
cucumber-core (7.1.0)
34-
cucumber-gherkin (~> 14.0, >= 14.0.1)
35-
cucumber-messages (~> 12.2, >= 12.2.0)
36-
cucumber-tag-expressions (~> 2.0, >= 2.0.4)
37-
cucumber-create-meta (1.0.0)
38-
cucumber-messages (~> 12.2, >= 12.2.0)
39-
sys-uname (~> 1.2, >= 1.2.1)
40-
cucumber-cucumber-expressions (10.3.0)
41-
cucumber-gherkin (14.2.0)
42-
cucumber-messages (~> 12.4, >= 12.4.0)
43-
cucumber-html-formatter (7.2.0)
44-
cucumber-messages (~> 12.4, >= 12.4.0)
45-
cucumber-messages (12.4.0)
46-
protobuf-cucumber (~> 3.10, >= 3.10.8)
47-
cucumber-tag-expressions (2.0.4)
48-
cucumber-wire (3.1.0)
49-
cucumber-core (~> 7.1, >= 7.1.0)
50-
cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
51-
cucumber-messages (~> 12.2, >= 12.2.0)
52-
cuke_modeler (3.15.0)
53-
cucumber-gherkin (< 23.0)
54-
diff-lcs (1.3)
55-
ffi (1.15.5)
56-
ffi (1.15.5-java)
57-
ffi (1.15.5-x64-mingw32)
16+
cucumber (9.2.1)
17+
builder (~> 3.2)
18+
cucumber-ci-environment (> 9, < 11)
19+
cucumber-core (> 13, < 14)
20+
cucumber-cucumber-expressions (~> 17.0)
21+
cucumber-gherkin (> 24, < 28)
22+
cucumber-html-formatter (> 20.3, < 22)
23+
cucumber-messages (> 19, < 25)
24+
diff-lcs (~> 1.5)
25+
mini_mime (~> 1.1)
26+
multi_test (~> 1.1)
27+
sys-uname (~> 1.2)
28+
cucumber-ci-environment (10.0.1)
29+
cucumber-core (13.0.3)
30+
cucumber-gherkin (>= 27, < 28)
31+
cucumber-messages (>= 20, < 23)
32+
cucumber-tag-expressions (> 5, < 7)
33+
cucumber-cucumber-expressions (17.1.0)
34+
bigdecimal
35+
cucumber-gherkin (27.0.0)
36+
cucumber-messages (>= 19.1.4, < 23)
37+
cucumber-html-formatter (21.9.0)
38+
cucumber-messages (> 19, < 28)
39+
cucumber-messages (22.0.0)
40+
cucumber-tag-expressions (6.1.2)
41+
cuke_modeler (3.24.0)
42+
cucumber-gherkin (< 33.0)
43+
diff-lcs (1.6.0)
44+
ffi (1.17.1)
5845
gherkin-ruby (0.3.2)
59-
i18n (1.10.0)
60-
concurrent-ruby (~> 1.0)
61-
json (2.6.3)
62-
json (2.6.3-java)
63-
middleware (0.1.0)
64-
minitest (5.5.1)
65-
multi_test (0.1.2)
66-
parallel (1.23.0)
67-
parser (3.2.2.1)
46+
json (2.10.1)
47+
json (2.10.1-java)
48+
language_server-protocol (3.17.0.4)
49+
lint_roller (1.1.0)
50+
mini_mime (1.1.5)
51+
minitest (5.25.4)
52+
multi_test (1.1.0)
53+
parallel (1.26.3)
54+
parser (3.3.7.1)
6855
ast (~> 2.4.1)
69-
power_assert (2.0.1)
70-
protobuf-cucumber (3.10.8)
71-
activesupport (>= 3.2)
72-
middleware
73-
thor
74-
thread_safe
75-
racc (1.8.0)
76-
racc (1.8.0-java)
56+
racc
57+
power_assert (2.0.5)
58+
racc (1.8.1)
59+
racc (1.8.1-java)
7760
rainbow (3.1.1)
78-
rake (13.0.6)
79-
regexp_parser (2.8.0)
80-
rexml (3.2.5)
81-
rspec (3.11.0)
82-
rspec-core (~> 3.11.0)
83-
rspec-expectations (~> 3.11.0)
84-
rspec-mocks (~> 3.11.0)
85-
rspec-core (3.11.0)
86-
rspec-support (~> 3.11.0)
87-
rspec-expectations (3.11.0)
61+
rake (13.2.1)
62+
regexp_parser (2.10.0)
63+
rspec (3.13.0)
64+
rspec-core (~> 3.13.0)
65+
rspec-expectations (~> 3.13.0)
66+
rspec-mocks (~> 3.13.0)
67+
rspec-core (3.13.3)
68+
rspec-support (~> 3.13.0)
69+
rspec-expectations (3.13.3)
8870
diff-lcs (>= 1.2.0, < 2.0)
89-
rspec-support (~> 3.11.0)
90-
rspec-mocks (3.11.0)
71+
rspec-support (~> 3.13.0)
72+
rspec-mocks (3.13.2)
9173
diff-lcs (>= 1.2.0, < 2.0)
92-
rspec-support (~> 3.11.0)
93-
rspec-support (3.11.0)
94-
rubocop (1.51.0)
74+
rspec-support (~> 3.13.0)
75+
rspec-support (3.13.2)
76+
rubocop (1.73.1)
9577
json (~> 2.3)
78+
language_server-protocol (~> 3.17.0.2)
79+
lint_roller (~> 1.1.0)
9680
parallel (~> 1.10)
97-
parser (>= 3.2.0.0)
81+
parser (>= 3.3.0.2)
9882
rainbow (>= 2.2.2, < 4.0)
99-
regexp_parser (>= 1.8, < 3.0)
100-
rexml (>= 3.2.5, < 4.0)
101-
rubocop-ast (>= 1.28.0, < 2.0)
83+
regexp_parser (>= 2.9.3, < 3.0)
84+
rubocop-ast (>= 1.38.0, < 2.0)
10285
ruby-progressbar (~> 1.7)
103-
unicode-display_width (>= 2.4.0, < 3.0)
104-
rubocop-ast (1.28.1)
105-
parser (>= 3.2.1.0)
86+
unicode-display_width (>= 2.4.0, < 4.0)
87+
rubocop-ast (1.38.1)
88+
parser (>= 3.3.1.0)
10689
ruby-progressbar (1.13.0)
10790
spinach (0.12.0)
10891
colorize
10992
gherkin-ruby (>= 0.3.2)
110-
sys-uname (1.2.2)
93+
sys-uname (1.3.1)
11194
ffi (~> 1.1)
112-
test-unit (3.5.3)
95+
test-unit (3.6.7)
11396
power_assert
114-
thor (1.2.1)
115-
thread_safe (0.3.6)
116-
thread_safe (0.3.6-java)
117-
tzinfo (2.0.4)
118-
concurrent-ruby (~> 1.0)
119-
unicode-display_width (2.4.2)
120-
zeitwerk (2.5.4)
97+
unicode-display_width (3.1.4)
98+
unicode-emoji (~> 4.0, >= 4.0.4)
99+
unicode-emoji (4.0.4)
121100

122101
PLATFORMS
123102
java
@@ -127,16 +106,16 @@ PLATFORMS
127106

128107
DEPENDENCIES
129108
bump
130-
cucumber (~> 4.0)
131-
cuke_modeler (~> 3.6)
132-
minitest (~> 5.5.0)
109+
cucumber
110+
cuke_modeler
111+
minitest
133112
parallel_tests!
134113
racc
135114
rake
136-
rspec (~> 3.3)
137-
rubocop (~> 1.51.0)
115+
rspec
116+
rubocop (~> 1.73.1)
138117
spinach
139118
test-unit
140119

141120
BUNDLED WITH
142-
2.3.7
121+
2.6.2

lib/parallel_tests/cli.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def parse_options!(argv)
349349
raise "--group-by #{allowed.join(" or ")} is required for --only-group"
350350
end
351351

352-
if options[:specify_groups] && (options.keys & [:single_process, :isolate, :isolate_count]).any?
352+
if options[:specify_groups] && options.keys.intersect?([:single_process, :isolate, :isolate_count])
353353
raise "Can't pass --specify-groups with any of these keys: --single, --isolate, or --isolate-n"
354354
end
355355

lib/parallel_tests/rspec/runner.rb

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
module ParallelTests
55
module RSpec
66
class Runner < ParallelTests::Test::Runner
7-
DEV_NULL = (WINDOWS ? "NUL" : "/dev/null")
87
class << self
98
def run_tests(test_files, process_number, num_processes, options)
109
cmd = [*executable, *options[:test_options], *color, *spec_opts, *test_files]

parallel_tests.gemspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ Gem::Specification.new name, ParallelTests::VERSION do |s|
1919
s.files = Dir["{lib,bin}/**/*"] + ["Readme.md"]
2020
s.license = "MIT"
2121
s.executables = ["parallel_spinach", "parallel_cucumber", "parallel_rspec", "parallel_test"]
22-
s.add_runtime_dependency "parallel"
23-
s.required_ruby_version = '>= 3.0.0'
22+
s.add_dependency "parallel"
23+
s.required_ruby_version = '>= 3.2.0'
2424
end

spec/fixtures/rails61/.gitattributes

-10
This file was deleted.

spec/fixtures/rails61/.gitignore

-30
This file was deleted.

spec/fixtures/rails61/.ruby-version

-1
This file was deleted.

spec/fixtures/rails61/Gemfile

-19
This file was deleted.

0 commit comments

Comments
 (0)