8000 Update dependencies (#8686) · activeadmin/activeadmin@a3eaefb · GitHub
[go: up one dir, main page]

Skip to content

Commit a3eaefb

Browse files
authored
Update dependencies (#8686)
Additionally, migrate RuboCop configuration to plugins and enable new cops, fixing a `Capybara/FindAllFirst` offense
1 parent e7a097f commit a3eaefb

File tree

6 files changed

+77
-63
lines changed

6 files changed

+77
-63
lines changed

.rubocop.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inherit_mode:
44
merge:
55
- Include
66

7-
require:
7+
plugins:
88
- rubocop-capybara
99
- rubocop-packaging
1010
- rubocop-performance
@@ -42,12 +42,18 @@ Capybara/ClickLinkOrButtonStyle:
4242
Capybara/CurrentPathExpectation:
4343
Enabled: true
4444

45+
Capybara/FindAllFirst:
46+
Enabled: true
47+
4548
Capybara/MatchStyle:
4649
Enabled: true
4750

4851
Capybara/NegationMatcher:
4952
Enabled: true
5053

54+
Capybara/NegationMatcherAfterVisit:
55+
Enabled: true
56+
5157
Capybara/RedundantWithinFind:
5258
Enabled: true
5359

@@ -315,6 +321,9 @@ Performance/UnfreezeString:
315321
Performance/UriDefaultParser:
316322
Enabled: true
317323

324+
Performance/ZipWithoutBlock:
325+
Enabled: true
326+
318327
Rails/FilePath:
319328
Enabled: true
320329
EnforcedStyle: slashes

Gemfile.lock

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,11 @@ GEM
112112
childprocess (5.1.0)
113113
logger (~> 1.5)
114114
concurrent-ruby (1.3.5)
115-
connection_pool (2.5.0)
115+
connection_pool (2.5.1)
116116
crass (1.0.6)
117117
cssbundling-rails (1.4.3)
118118
railties (>= 6.0.0)
119-
csv (3.3.3)
119+
csv (3.3.4)
120120
cucumber (9.2.1)
121121
builder (~> 3.2)
122122
cucumber-ci-environment (> 9, < 11)
@@ -176,10 +176,10 @@ GEM
176176
concurrent-ruby (~> 1.1)
177177
webrick (~> 1.7)
178178
websocket-driver (~> 0.7)
179-
ffi (1.17.1-aarch64-linux-gnu)
180-
ffi (1.17.1-arm64-darwin)
181-
ffi (1.17.1-x86_64-darwin)
182-
ffi (1.17.1-x86_64-linux-gnu)
179+
ffi (1.17.2-aarch64-linux-gnu)
180+
ffi (1.17.2-arm64-darwin)
181+
ffi (1.17.2-x86_64-darwin)
182+
ffi (1.17.2-x86_64-linux-gnu)
183183
formtastic (5.0.0)
184184
actionpack (>= 6.0.0)
185185
formtastic_i18n (0.7.0)
@@ -254,7 +254,7 @@ GEM
254254
mini_mime (1.1.5)
255255
minitest (5.25.5)
256256
multi_test (1.1.0)
257-
net-imap (0.5.6)
257+
net-imap (0.5.7)
258258
date
259259
net-protocol
260260
net-pop (0.1.2)
@@ -264,19 +264,19 @@ GEM
264264
net-smtp (0.5.1)
265265
net-protocol
266266
nio4r (2.7.4)
267-
nokogiri (1.18.7-aarch64-linux-gnu)
267+
nokogiri (1.18.8-aarch64-linux-gnu)
268268
racc (~> 1.4)
269-
nokogiri (1.18.7-arm64-darwin)
269+
nokogiri (1.18.8-arm64-darwin)
270270
racc (~> 1.4)
271-
nokogiri (1.18.7-x86_64-darwin)
271+
nokogiri (1.18.8-x86_64-darwin)
272272
racc (~> 1.4)
273-
nokogiri (1.18.7-x86_64-linux-gnu)
273+
nokogiri (1.18.8-x86_64-linux-gnu)
274274
racc (~> 1.4)
275275
orm_adapter (0.5.0)
276-
parallel (1.26.3)
276+
parallel (1.27.0)
277277
parallel_tests (5.1.0)
278278
parallel
279-
parser (3.3.7.4)
279+
parser (3.3.8.0)
280280
ast (~> 2.4.1)
281281
racc
282282
pp (0.6.2)
@@ -290,7 +290,7 @@ GEM
290290
pundit (2.5.0)
291291
activesupport (>= 3.0.0)
292292
racc (1.8.1)
293-
rack (3.1.12)
293+
rack (3.1.13)
294294
rack-session (2.1.0)
295295
base64 (>= 0.1.0)
296296
rack (>= 3.0.0)
@@ -375,7 +375,7 @@ GEM
375375
rubocop-ast (>= 1.44.0, < 2.0)
376376
ruby-progressbar (~> 1.7)
377377
unicode-display_width (>= 2.4.0, < 4.0)
378-
rubocop-ast (1.44.0)
378+
rubocop-ast (1.44.1)
379379
parser (>= 3.3.7.2)
380380
prism (~> 1.4)
381381
rubocop-capybara (2.22.1)
@@ -394,7 +394,7 @@ GEM
394394
rack (>= 1.1)
395395
rubocop (>= 1.75.0, < 2.0)
396396
rubocop-ast (>= 1.38.0, < 2.0)
397-
rubocop-rspec (3.5.0)
397+
rubocop-rspec (3.6.0)
398398
lint_roller (~> 1.1)
399399
rubocop (~> 1.72, >= 1.72.1)
400400
ruby-progressbar (1.13.0)
@@ -409,8 +409,9 @@ GEM
409409
simplecov (~> 0.19)
410410
simplecov-html (0.13.1)
411411
simplecov_json_formatter (0.1.4)
412-
sprockets (4.2.1)
412+
sprockets (4.2.2)
413413
concurrent-ruby (~> 1.0)
414+
logger
414415
rack (>= 2.2.4, < 4)
415416
sprockets-rails (3.5.2)
416417
actionpack (>= 6.1)
@@ -420,7 +421,7 @@ GEM
420421
sqlite3 (2.6.0-arm64-darwin)
421422
sqlite3 (2.6.0-x86_64-darwin)
422423
sqlite3 (2.6.0-x86_64-linux-gnu)
423-
stringio (3.1.6)
424+
stringio (3.1.7)
424425
sys-uname (1.3.1)
425426
ffi (~> 1.1)
426427
terminal-table (4.0.0)
@@ -487,4 +488,4 @@ DEPENDENCIES
487488
webrick
488489

489490
BUNDLED WITH
490-
2.6.7
491+
2.6.8

features/step_definitions/attribute_steps.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
end
1111

1212
Then(/^I should see the attribute "([^"]*)" with a nicely formatted datetime$/) do |title|
13-
text = all(".attributes-table th:contains('#{title}') ~ td").first.text
13+
text = first(".attributes-table th:contains('#{title}') ~ td").text
1414
expect(text).to match(/\w+ \d{1,2}, \d{4} \d{2}:\d{2}/)
1515
end
1616

gemfiles/rails_70/Gemfile.lock

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ GEM
108108
crass (1.0.6)
109109
cssbundling-rails (1.4.3)
110110
railties (>= 6.0.0)
111-
csv (3.3.3)
111+
csv (3.3.4)
112112
cucumber (9.2.1)
113113
builder (~> 3.2)
114114
cucumber-ci-environment (> 9, < 11)
@@ -167,9 +167,9 @@ GEM
167167
concurrent-ruby (~> 1.1)
168168
webrick (~> 1.7)
169169
websocket-driver (~> 0.7)
170-
ffi (1.17.1)
171-
ffi (1.17.1-arm64-darwin)
172-
ffi (1.17.1-x86_64-linux-gnu)
170+
ffi (1.17.2)
171+
ffi (1.17.2-arm64-darwin)
172+
ffi (1.17.2-x86_64-linux-gnu)
173173
formtastic (5.0.0)
174174
actionpack (>= 6.0.0)
175175
formtastic_i18n (0.7.0)
@@ -239,27 +239,28 @@ GEM
239239
mini_portile2 (2.8.8)
240240
minitest (5.25.5)
241241
multi_test (1.1.0)
242-
net-imap (0.5.6)
242+
net-imap (0.5.7)
243243
date
244244
net-protocol
245245
net-pop (0.1.2)
246+
net-protocol
246247
net-protocol (0.2.2)
247248
timeout
248249
net-smtp (0.5.1)
249250
net-protocol
250251
nio4r (2.7.4)
251-
nokogiri (1.18.7)
252+
nokogiri (1.18.8)
252253
mini_portile2 (~> 2.8.2)
253254
racc (~> 1.4)
254-
nokogiri (1.18.7-arm64-darwin)
255+
nokogiri (1.18.8-arm64-darwin)
255256
racc (~> 1.4)
256-
nokogiri (1.18.7-x86_64-linux-gnu)
257+
nokogiri (1.18.8-x86_64-linux-gnu)
257258
racc (~> 1.4)
258259
orm_adapter (0.5.0)
259-
parallel (1.26.3)
260+
parallel (1.27.0)
260261
parallel_tests (4.10.1)
261262
parallel
262-
parser (3.3.7.4)
263+
parser (3.3.8.0)
263264
ast (~> 2.4.1)
264265
racc
265266
public_suffix (6.0.1)
@@ -343,8 +344,9 @@ GEM
343344
simplecov (~> 0.19)
344345
simplecov-html (0.13.1)
345346
simplecov_json_formatter (0.1.4)
346-
sprockets (4.2.1)
347+
sprockets (4.2.2)
347348
concurrent-ruby (~> 1.0)
349+
logger
348350
rack (>= 2.2.4, < 4)
349351
sprockets-rails (3.5.2)
350352
actionpack (>= 6.1)
@@ -411,4 +413,4 @@ DEPENDENCIES
411413
zeitwerk (~> 2.6.18)
412414

413415
BUNDLED WITH
414-
2.6.7
416+
2.6.8

gemfiles/rails_71/Gemfile.lock

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@ GEM
118118
childprocess (5.1.0)
119119
logger (~> 1.5)
120120
concurrent-ruby (1.3.5)
121-
connection_pool (2.5.0)
121+
connection_pool (2.5.1)
122122
crass (1.0.6)
123123
cssbundling-rails (1.4.3)
124124
railties (>= 6.0.0)
125-
csv (3.3.3)
125+
csv (3.3.4)
126126
cucumber (9.2.1)
127127
builder (~> 3.2)
128128
cucumber-ci-environment (> 9, < 11)
@@ -182,9 +182,9 @@ GEM
182182
concurrent-ruby (~> 1.1)
183183
webrick (~> 1.7)
184184
websocket-driver (~> 0.7)
185-
ffi (1.17.1)
186-
ffi (1.17.1-arm64-darwin)
187-
ffi (1.17.1-x86_64-linux-gnu)
185+
ffi (1.17.2)
186+
ffi (1.17.2-arm64-darwin)
187+
ffi (1.17.2-x86_64-linux-gnu)
188188
formtastic (5.0.0)
189189
actionpack (>= 6.0.0)
190190
formtastic_i18n (0.7.0)
@@ -258,7 +258,7 @@ GEM
258258
minitest (5.25.5)
259259
multi_test (1.1.0)
260260
mutex_m (0.3.0)
261-
net-imap (0.5.6)
261+
net-imap (0.5.7)
262262
date
263263
net-protocol
264264
net-pop (0.1.2)
@@ -268,18 +268,18 @@ GEM
268268
net-smtp (0.5.1)
269269
net-protocol
270270
nio4r (2.7.4)
271-
nokogiri (1.18.7)
271+
nokogiri (1.18.8)
272272
mini_portile2 (~> 2.8.2)
273273
racc (~> 1.4)
274-
nokogiri (1.18.7-arm64-darwin)
274+
nokogiri (1.18.8-arm64-darwin)
275275
racc (~> 1.4)
276-
nokogiri (1.18.7-x86_64-linux-gnu)
276+
nokogiri (1.18.8-x86_64-linux-gnu)
277277
racc (~> 1.4)
278278
orm_adapter (0.5.0)
279-
parallel (1.26.3)
279+
parallel (1.27.0)
280280
parallel_tests (4.10.1)
281281
parallel
282-
parser (3.3.7.4)
282+
parser (3.3.8.0)
283283
ast (~> 2.4.1)
284284
racc
285285
pp (0.6.2)
@@ -292,7 +292,7 @@ GEM
292292
pundit (2.5.0)
293293
activesupport (>= 3.0.0)
294294
racc (1.8.1)
295-
rack (3.1.12)
295+
rack (3.1.13)
296296
rack-session (2.1.0)
297297
base64 (>= 0.1.0)
298298
rack (>= 3.0.0)
@@ -378,8 +378,9 @@ GEM
378378
simplecov (~> 0.19)
379379
simplecov-html (0.13.1)
380380
simplecov_json_formatter (0.1.4)
381-
sprockets (4.2.1)
381+
sprockets (4.2.2)
382382
concurrent-ruby (~> 1.0)
383+
logger
383384
rack (>= 2.2.4, < 4)
384385
sprockets-rails (3.5.2)
385386
actionpack (>= 6.1)
@@ -389,7 +390,7 @@ GEM
389390
mini_portile2 (~> 2.8.0)
390391
sqlite3 (2.6.0-arm64-darwin)
391392
sqlite3 (2.6.0-x86_64-linux-gnu)
392-
stringio (3.1.6)
393+
stringio (3.1.7)
393394
sys-uname (1.3.1)
394395
ffi (~> 1.1)
395396
terminal-table (4.0.0)
@@ -448,4 +449,4 @@ DEPENDENCIES
448449
zeitwerk (~> 2.6.18)
449450

450451
BUNDLED WITH
451-
2.6.7
452+
2.6.8

0 commit comments

Comments
 (0)
0