Skip to content

Commit bce170c

Browse files
authored
Test against Ruby 3.4 (#950)
Additionally: return implicit `nil` from `SingletonHelpers#collection` to keep the same coverage results as 3.3
1 parent 4b53104 commit bce170c

File tree

7 files changed

+136
-139
lines changed

7 files changed

+136
-139
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
- "3.1"
1919
- "3.2"
2020
- "3.3"
21+
- "3.4"
2122
rails:
2223
- rails_70
2324
- rails_71
@@ -26,6 +27,8 @@ jobs:
2627
exclude:
2728
- ruby: "3.1"
2829
rails: rails_80
30+
- ruby: "3.4"
31+
rails: rails_70
2932
steps:
3033
- uses: actions/checkout@v4
3134
- name: Configure bundler (default)

.github/workflows/rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55

66
env:
7-
RUBY_VERSION: ${{ vars.RUBOCOP_RUBY_VERSION || '3.3' }}
7+
RUBY_VERSION: ${{ vars.RUBOCOP_RUBY_VERSION || '3.4' }}
88

99
jobs:
1010
rubocop:

Gemfile.lock

Lines changed: 78 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,65 @@ PATH
1010
GEM
1111
remote: https://rubygems.org/
1212
specs:
13-
actioncable (8.0.0.1)
14-
actionpack (= 8.0.0.1)
15-
activesupport (= 8.0.0.1)
13+
actioncable (8.0.1)
14+
actionpack (= 8.0.1)
15+
activesupport (= 8.0.1)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
1818
zeitwerk (~> 2.6)
19-
actionmailbox (8.0.0.1)
20-
actionpack (= 8.0.0.1)
21-
activejob (= 8.0.0.1)
22-
activerecord (= 8.0.0.1)
23-
activestorage (= 8.0.0.1)
24-
activesupport (= 8.0.0.1)
19+
actionmailbox (8.0.1)
20+
actionpack (= 8.0.1)
21+
activejob (= 8.0.1)
22+
activerecord (= 8.0.1)
23+
activestorage (= 8.0.1)
24+
activesupport (= 8.0.1)
2525
mail (>= 2.8.0)
26-
actionmailer (8.0.0.1)
27-
actionpack (= 8.0.0.1)
28-
actionview (= 8.0.0.1)
29-
activejob (= 8.0.0.1)
30-
activesupport (= 8.0.0.1)
26+
actionmailer (8.0.1)
27+
actionpack (= 8.0.1)
28+
actionview (= 8.0.1)
29+
activejob (= 8.0.1)
30+
activesupport (= 8.0.1)
3131
mail (>= 2.8.0)
3232
rails-dom-testing (~> 2.2)
33-
actionpack (8.0.0.1)
34-
actionview (= 8.0.0.1)
35-
activesupport (= 8.0.0.1)
33+
actionpack (8.0.1)
34+
actionview (= 8.0.1)
35+
activesupport (= 8.0.1)
3636
nokogiri (>= 1.8.5)
3737
rack (>= 2.2.4)
3838
rack-session (>= 1.0.1)
3939
rack-test (>= 0.6.3)
4040
rails-dom-testing (~> 2.2)
4141
rails-html-sanitizer (~> 1.6)
4242
useragent (~> 0.16)
43-
actiontext (8.0.0.1)
44-
actionpack (= 8.0.0.1)
45-
activerecord (= 8.0.0.1)
46-
activestorage (= 8.0.0.1)
47-
activesupport (= 8.0.0.1)
43+
actiontext (8.0.1)
44+
actionpack (= 8.0.1)
45+
activerecord (= 8.0.1)
46+
activestorage (= 8.0.1)
47+
activesupport (= 8.0.1)
4848
globalid (>= 0.6.0)
4949
nokogiri (>= 1.8.5)
50-
actionview (8.0.0.1)
51-
activesupport (= 8.0.0.1)
50+
actionview (8.0.1)
51+
activesupport (= 8.0.1)
5252
builder (~> 3.1)
5353
erubi (~> 1.11)
5454
rails-dom-testing (~> 2.2)
5555
rails-html-sanitizer (~> 1.6)
56-
activejob (8.0.0.1)
57-
activesupport (= 8.0.0.1)
56+
activejob (8.0.1)
57+
activesupport (= 8.0.1)
5858
globalid (>= 0.3.6)
59-
activemodel (8.0.0.1)
60-
activesupport (= 8.0.0.1)
61-
activerecord (8.0.0.1)
62-
activemodel (= 8.0.0.1)
63-
activesupport (= 8.0.0.1)
59+
activemodel (8.0.1)
60+
activesupport (= 8.0.1)
61+
activerecord (8.0.1)
62+
activemodel (= 8.0.1)
63+
activesupport (= 8.0.1)
6464
timeout (>= 0.4.0)
65-
activestorage (8.0.0.1)
66-
actionpack (= 8.0.0.1)
67-
activejob (= 8.0.0.1)
68-
activerecord (= 8.0.0.1)
69-
activesupport (= 8.0.0.1)
65+
activestorage (8.0.1)
66+
actionpack (= 8.0.1)
67+
activejob (= 8.0.1)
68+
activerecord (= 8.0.1)
69+
activesupport (= 8.0.1)
7070
marcel (~> 1.0)
71-
activesupport (8.0.0.1)
71+
activesupport (8.0.1)
7272
base64
7373
benchmark (>= 0.3)
7474
bigdecimal
@@ -85,15 +85,15 @@ GEM
8585
ast (2.4.2)
8686
base64 (0.2.0)
8787
benchmark (0.4.0)
88-
bigdecimal (3.1.8)
88+
bigdecimal (3.1.9)
8989
builder (3.3.0)
9090
concurrent-ruby (1.3.4)
9191
connection_pool (2.4.1)
9292
crass (1.0.6)
9393
date (3.4.1)
9494
docile (1.4.1)
9595
drb (2.2.1)
96-
erubi (1.13.0)
96+
erubi (1.13.1)
9797
globalid (1.2.1)
9898
activesupport (>= 6.1)
9999
has_scope (0.8.2)
@@ -102,12 +102,12 @@ GEM
102102
i18n (1.14.6)
103103
concurrent-ruby (~> 1.0)
104104
io-console (0.8.0)
105-
irb (1.14.1)
105+
irb (1.14.3)
106106
rdoc (>= 4.0.0)
107107
reline (>= 0.4.2)
108-
json (2.9.0)
108+
json (2.9.1)
109109
language_server-protocol (3.17.0.3)
110-
logger (1.6.2)
110+
logger (1.6.4)
111111
loofah (2.23.1)
112112
crass (~> 1.0.2)
113113
nokogiri (>= 1.12.0)
@@ -127,56 +127,55 @@ GEM
127127
ruby-progressbar
128128
mocha (2.7.1)
129129
ruby2_keywords (>= 0.0.5)
130-
net-imap (0.5.1)
130+
net-imap (0.5.4)
131131
date
132132
net-protocol
133133
net-pop (0.1.2)
134134
net-protocol
135135
net-protocol (0.2.2)
136136
timeout
137137
net-smtp (0.5.0)
138-
net-protocol
139138
nio4r (2.7.4)
140-
nokogiri (1.17.1)
139+
nokogiri (1.18.0)
141140
mini_portile2 (~> 2.8.2)
142141
racc (~> 1.4)
143-
nokogiri (1.17.1-aarch64-linux)
142+
nokogiri (1.18.0-aarch64-linux-gnu)
144143
racc (~> 1.4)
145-
nokogiri (1.17.1-arm64-darwin)
144+
nokogiri (1.18.0-arm64-darwin)
146145
racc (~> 1.4)
147-
nokogiri (1.17.1-x86_64-darwin)
146+
nokogiri (1.18.0-x86_64-darwin)
148147
racc (~> 1.4)
149-
nokogiri (1.17.1-x86_64-linux)
148+
nokogiri (1.18.0-x86_64-linux-gnu)
150149
racc (~> 1.4)
151150
parallel (1.26.3)
152151
parser (3.3.6.0)
153152
ast (~> 2.4.1)
154153
racc
155-
psych (5.2.1)
154+
psych (5.2.2)
156155
date
157156
stringio
158157
racc (1.8.1)
159158
rack (3.1.8)
160159
rack-session (2.0.0)
161160
rack (>= 3.0.0)
162-
rack-test (2.1.0)
161+
rack-test (2.2.0)
163162
rack (>= 1.3)
164163
rackup (2.2.1)
165164
rack (>= 3)
166-
rails (8.0.0.1)
167-
actioncable (= 8.0.0.1)
168-
actionmailbox (= 8.0.0.1)
169-
actionmailer (= 8.0.0.1)
170-
actionpack (= 8.0.0.1)
171-
actiontext (= 8.0.0.1)
172-
actionview (= 8.0.0.1)
173-
activejob (= 8.0.0.1)
174-
activemodel (= 8.0.0.1)
175-
activerecord (= 8.0.0.1)
176-
activestorage (= 8.0.0.1)
177-
activesupport (= 8.0.0.1)
165+
rails (8.0.1)
166+
actioncable (= 8.0.1)
167+
actionmailbox (= 8.0.1)
168+
actionmailer (= 8.0.1)
169+
actionpack (= 8.0.1)
170+
actiontext (= 8.0.1)
171+
actionview (= 8.0.1)
172+
activejob (= 8.0.1)
173+
activemodel (= 8.0.1)
174+
activerecord (= 8.0.1)
175+
activestorage (= 8.0.1)
176+
activesupport (= 8.0.1)
178177
bundler (>= 1.15.0)
179-
railties (= 8.0.0.1)
178+
railties (= 8.0.1)
180179
rails-controller-testing (1.0.5)
181180
actionpack (>= 5.0.1.rc1)
182181
actionview (>= 5.0.1.rc1)
@@ -185,29 +184,29 @@ GEM
185184
activesupport (>= 5.0.0)
186185
minitest
187186
nokogiri (>= 1.6)
188-
rails-html-sanitizer (1.6.1)
187+
rails-html-sanitizer (1.6.2)
189188
loofah (~> 2.21)
190189
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
191-
railties (8.0.0.1)
192-
actionpack (= 8.0.0.1)
193-
activesupport (= 8.0.0.1)
190+
railties (8.0.1)
191+
actionpack (= 8.0.1)
192+
activesupport (= 8.0.1)
194193
irb (~> 1.13)
195194
rackup (>= 1.0.0)
196195
rake (>= 12.2)
197196
thor (~> 1.0, >= 1.2.2)
198197
zeitwerk (~> 2.6)
199198
rainbow (3.1.1)
200199
rake (13.2.1)
201-
rdoc (6.8.1)
200+
rdoc (6.10.0)
202201
psych (>= 4.0.0)
203-
regexp_parser (2.9.3)
204-
reline (0.5.12)
202+
regexp_parser (2.10.0)
203+
reline (0.6.0)
205204
io-console (~> 0.5)
206205
responders (3.1.1)
207206
actionpack (>= 5.2)
208207
railties (>= 5.2)
209-
rexml (3.3.9)
210-
rubocop (1.69.1)
208+
rexml (3.4.0)
209+
rubocop (1.69.2)
211210
json (~> 2.3)
212211
language_server-protocol (>= 3.17.0)
213212
parallel (~> 1.10)
@@ -217,7 +216,7 @@ GEM
217216
rubocop-ast (>= 1.36.2, < 2.0)
218217
ruby-progressbar (~> 1.7)
219218
unicode-display_width (>= 2.4.0, < 4.0)
220-
rubocop-ast (1.36.2)
219+
rubocop-ast (1.37.0)
221220
parser (>= 3.3.1.0)
222221
rubocop-minitest (0.36.0)
223222
rubocop (>= 1.61, < 2.0)
@@ -229,7 +228,7 @@ GEM
229228
rubocop-ast (>= 1.31.1, < 2.0)
230229
ruby-progressbar (1.13.0)
231230
ruby2_keywords (0.0.5)
232-
securerandom (0.4.0)
231+
securerandom (0.4.1)
233232
simplecov (0.22.0)
234233
docile (~> 1.1)
235234
simplecov-html (~> 0.11)
@@ -241,15 +240,15 @@ GEM
241240
simplecov_json_formatter (0.1.4)
242241
stringio (3.1.2)
243242
thor (1.3.2)
244-
timeout (0.4.2)
243+
timeout (0.4.3)
245244
tzinfo (2.0.6)
246245
concurrent-ruby (~> 1.0)
247-
unicode-display_width (3.1.2)
246+
unicode-display_width (3.1.3)
248247
unicode-emoji (~> 4.0, >= 4.0.4)
249248
unicode-emoji (4.0.4)
250249
uri (1.0.2)
251250
useragent (0.16.11)
252-
warning (1.4.0)
251+
warning (1.5.0)
253252
websocket-driver (0.7.6)
254253
websocket-extensions (>= 0.1.0)
255254
websocket-extensions (0.1.5)
@@ -278,4 +277,4 @@ DEPENDENCIES
278277
warning
279278

280279
BUNDLED WITH
281-
2.5.22
280+
2.6.2

0 commit comments

Comments
 (0)