Skip to content

Commit 308d414

Browse files
committed
Upgrade to rubocop@1.84.1, rubocop-performance@1.26.1, rubocop-rails@2.34.3, rubocop-rpec@3.9.0, rubocop-rspec_rails@2.32.0, rubocop-factory_bot@2.28.0 & rubocop-config-oharagroup@2.6.0
1 parent e14649a commit 308d414

File tree

9 files changed

+52
-52
lines changed

9 files changed

+52
-52
lines changed

.rubocop.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
---
2-
require:
3-
- rubocop-factory_bot
4-
- rubocop-rspec_rails
5-
62
plugins:
3+
- rubocop-factory_bot
74
- rubocop-performance
85
- rubocop-rails
96
- rubocop-rake
107
- rubocop-rspec
8+
- rubocop-rspec_rails
119

1210
inherit_gem:
1311
rubocop-config-oharagroup:

Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,28 @@ group :development, :test do
3232
gem 'simplecov', '0.22.0', require: false
3333

3434
# Code style checker
35-
gem 'rubocop', '1.72.2', require: false
35+
gem 'rubocop', '1.84.1', require: false
3636

3737
# Rubocop Rails cops
38-
gem 'rubocop-rails', '2.30.1', require: false
38+
gem 'rubocop-rails', '2.34.3', require: false
3939

4040
# Rubocop Performance cops
41-
gem 'rubocop-performance', '1.24.0', require: false
41+
gem 'rubocop-performance', '1.26.1', require: false
4242

4343
# Rubocop RSpec cops
44-
gem 'rubocop-rspec', '3.5.0', require: false
44+
gem 'rubocop-rspec', '3.9.0', require: false
4545

4646
# Rubocop RSpec Rails cops
47-
gem 'rubocop-rspec_rails', '2.30.0', require: false
47+
gem 'rubocop-rspec_rails', '2.32.0', require: false
4848

4949
# Rubocop FactoryBot cops
50-
gem 'rubocop-factory_bot', '2.26.1', require: false
50+
gem 'rubocop-factory_bot', '2.28.0', require: false
5151

5252
# Rubocop Rake cops
5353
gem 'rubocop-rake', '0.7.1', require: false
5454

5555
# Shared Rubocop config
56-
gem 'rubocop-config-oharagroup', '2.5.0', require: false
56+
gem 'rubocop-config-oharagroup', '2.6.0', require: false
5757

5858
# Debugging
5959
gem 'debug', '1.11.1', require: 'debug/prelude'

Gemfile.lock

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -232,42 +232,44 @@ GEM
232232
rspec-mocks (~> 3.13)
233233
rspec-support (~> 3.13)
234234
rspec-support (3.13.7)
235-
rubocop (1.72.2)
235+
rubocop (1.84.1)
236236
json (~> 2.3)
237237
language_server-protocol (~> 3.17.0.2)
238238
lint_roller (~> 1.1.0)
239239
parallel (~> 1.10)
240240
parser (>= 3.3.0.2)
241241
rainbow (>= 2.2.2, < 4.0)
242242
regexp_parser (>= 2.9.3, < 3.0)
243-
rubocop-ast (>= 1.38.0, < 2.0)
243+
rubocop-ast (>= 1.49.0, < 2.0)
244244
ruby-progressbar (~> 1.7)
245245
unicode-display_width (>= 2.4.0, < 4.0)
246246
rubocop-ast (1.49.0)
247247
parser (>= 3.3.7.2)
248248
prism (~> 1.7)
249-
rubocop-config-oharagroup (2.5.0)
250-
rubocop-factory_bot (2.26.1)
251-
rubocop (~> 1.61)
252-
rubocop-performance (1.24.0)
249+
rubocop-config-oharagroup (2.6.0)
250+
rubocop-factory_bot (2.28.0)
253251
lint_roller (~> 1.1)
254-
rubocop (>= 1.72.1, < 2.0)
255-
rubocop-ast (>= 1.38.0, < 2.0)
256-
rubocop-rails (2.30.1)
252+
rubocop (~> 1.72, >= 1.72.1)
253+
rubocop-performance (1.26.1)
254+
lint_roller (~> 1.1)
255+
rubocop (>= 1.75.0, < 2.0)
256+
rubocop-ast (>= 1.47.1, < 2.0)
257+
rubocop-rails (2.34.3)
257258
activesupport (>= 4.2.0)
258259
lint_roller (~> 1.1)
259260
rack (>= 1.1)
260-
rubocop (>= 1.72.1, < 2.0)
261-
rubocop-ast (>= 1.38.0, < 2.0)
261+
rubocop (>= 1.75.0, < 2.0)
262+
rubocop-ast (>= 1.44.0, < 2.0)
262263
rubocop-rake (0.7.1)
263264
lint_roller (~> 1.1)
264265
rubocop (>= 1.72.1)
265-
rubocop-rspec (3.5.0)
266+
rubocop-rspec (3.9.0)
267+
lint_roller (~> 1.1)
268+
rubocop (~> 1.81)
269+
rubocop-rspec_rails (2.32.0)
266270
lint_roller (~> 1.1)
267271
rubocop (~> 1.72, >= 1.72.1)
268-
rubocop-rspec_rails (2.30.0)
269-
rubocop (~> 1.61)
270-
rubocop-rspec (~> 3, >= 3.0.1)
272+
rubocop-rspec (~> 3.5)
271273
ruby-progressbar (1.13.0)
272274
securerandom (0.4.1)
273275
simplecov (0.22.0)
@@ -308,14 +310,14 @@ DEPENDENCIES
308310
puma (= 7.2.0)
309311
rails (= 8.1.2)
310312
rspec-rails (= 8.0.2)
311-
rubocop (= 1.72.2)
312-
rubocop-config-oharagroup (= 2.5.0)
313-
rubocop-factory_bot (= 2.26.1)
314-
rubocop-performance (= 1.24.0)
315-
rubocop-rails (= 2.30.1)
313+
rubocop (= 1.84.1)
314+
rubocop-config-oharagroup (= 2.6.0)
315+
rubocop-factory_bot (= 2.28.0)
316+
rubocop-performance (= 1.26.1)
317+
rubocop-rails (= 2.34.3)
316318
rubocop-rake (= 0.7.1)
317-
rubocop-rspec (= 3.5.0)
318-
rubocop-rspec_rails (= 2.30.0)
319+
rubocop-rspec (= 3.9.0)
320+
rubocop-rspec_rails (= 2.32.0)
319321
simplecov (= 0.22.0)
320322

321323
CHECKSUMS
@@ -404,15 +406,15 @@ CHECKSUMS
404406
rspec-mocks (3.13.7) sha256=0979034e64b1d7a838aaaddf12bf065ea4dc40ef3d4c39f01f93ae2c66c62b1c
405407
rspec-rails (8.0.2) sha256=113139a53f5d068d4f48d1c29ad5f982013ed9b0daa69d7f7b266eda5d433ace
406408
rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
407-
rubocop (1.72.2) sha256=0259a32d89fee60882bf4c4d8847e696357719c9db4971839da742bf053ae96b
409+
rubocop (1.84.1) sha256=14cc626f355141f5a2ef53c10a68d66b13bb30639b26370a76559096cc6bcc1a
408410
rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
409-
rubocop-config-oharagroup (2.5.0) sha256=2ab62af1e4e78738824c620e3dc91e0e343a3a2203e90ae2b1373345d7659aee
410-
rubocop-factory_bot (2.26.1) sha256=8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa
411-
rubocop-performance (1.24.0) sha256=e5bd39ff3e368395b9af886927cc37f5892f43db4bd6c8526594352d5b4440b5
412-
rubocop-rails (2.30.1) sha256=5eb39fbfce4e63fb0d79d48ba9a3fbc23d33dd9fa4585b8f9c811056fe156c10
411+
rubocop-config-oharagroup (2.6.0) sha256=caadf174dabaa18e4fad8f3f90c7a80110705bb3398bb55b8f80d82948a43473
412+
rubocop-factory_bot (2.28.0) sha256=4b17fc02124444173317e131759d195b0d762844a71a29fe8139c1105d92f0cb
413+
rubocop-performance (1.26.1) sha256=cd19b936ff196df85829d264b522fd4f98b6c89ad271fa52744a8c11b8f71834
414+
rubocop-rails (2.34.3) sha256=10d37989024865ecda8199f311f3faca990143fbac967de943f88aca11eb9ad2
413415
rubocop-rake (0.7.1) sha256=3797f2b6810c3e9df7376c26d5f44f3475eda59eb1adc38e6f62ecf027cbae4d
414-
rubocop-rspec (3.5.0) sha256=710c942fe1af884ba8eea75cbb8bdbb051929a2208880a6fc2e2dce1eed5304c
415-
rubocop-rspec_rails (2.30.0) sha256=888112e83f9d7ef7ad2397e9d69a0b9614a4bae24f072c399804a180f80c4c46
416+
rubocop-rspec (3.9.0) sha256=8fa70a3619408237d789aeecfb9beef40576acc855173e60939d63332fdb55e2
417+
rubocop-rspec_rails (2.32.0) sha256=4a0d641c72f6ebb957534f539d9d0a62c47abd8ce0d0aeee1ef4701e892a9100
416418
ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
417419
securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
418420
simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5

db/seeds.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def delete_existing_data
5151
end
5252

5353
def load_programs
54-
programs = @documents.filter { _1['type'].eql? 'Program' }
54+
programs = @documents.filter { it['type'].eql? 'Program' }
5555
programs.each_with_index do |program, index|
5656
@programs[program['id']] = ::Program.create!(name: program['programName'])
5757
progress 'Loaded', index, 'program' if (index % 10).zero?
@@ -60,7 +60,7 @@ def load_programs
6060
end
6161

6262
def load_series
63-
series_list = @documents.filter { _1['type'].eql? 'Series' }
63+
series_list = @documents.filter { it['type'].eql? 'Series' }
6464
series_list.each_with_index do |series, index|
6565
@series[series['id']] = ::Series.create!(
6666
name: series['seriesName'],
@@ -73,7 +73,7 @@ def load_series
7373
end
7474

7575
def load_episodes
76-
episodes = @documents.filter { _1['type'].eql? 'Episode' }
76+
episodes = @documents.filter { it['type'].eql? 'Episode' }
7777
episodes.each_with_index do |episode, index|
7878
::Episode.create!(
7979
name: episode['episodeName'],

spec/factories/episodes.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
::FactoryBot.define do
55
factory :episode do
6-
sequence(:name) { "Episode #{_1}" }
6+
sequence(:name) { "Episode #{it}" }
77
series
88

99
transient do
@@ -39,11 +39,11 @@
3939
end
4040

4141
trait :past_date do
42-
sequence(:status_date) { ::Time.zone.today - _1 }
42+
sequence(:status_date) { ::Time.zone.today - it }
4343
end
4444

4545
trait :future_date do
46-
sequence(:status_date) { ::Time.zone.today + _1 }
46+
sequence(:status_date) { ::Time.zone.today + it }
4747
end
4848

4949
trait :unverified do

spec/factories/programs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
::FactoryBot.define do
55
factory :program do
6-
sequence(:name) { "Program #{_1}" }
6+
sequence(:name) { "Program #{it}" }
77

88
transient do
99
series { 0 }

spec/factories/series.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
::FactoryBot.define do
55
factory :series do
6-
sequence(:name) { "Series #{_1}" }
6+
sequence(:name) { "Series #{it}" }
77
program
88

99
transient do

spec/models/episode_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
fourth_episode = create(:episode, name: 'Episode 4', seq: 4, series:)
6262
second_episode = create(:episode, name: 'Episode 2', seq: 2, series:)
6363

64-
expect(described_class.list(series.id).map { [_1.sequence, _1.id] }).to eq [
64+
expect(described_class.list(series.id).map { [it.sequence, it.id] }).to eq [
6565
[1, first_episode.id],
6666
[2, second_episode.id],
6767
[3, third_episode.id],

spec/models/series_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
create(:series, name: 'Series 2', program: program_one, now_showing: 8)
102102
create(:series, name: 'Series 1', program: program_three, expected: 1)
103103

104-
expect(described_class.scheduled.map { [_1.now_showing, _1.program_name, _1.name] }).to eq [
104+
expect(described_class.scheduled.map { [it.now_showing, it.program_name, it.name] }).to eq [
105105
[1, 'Program 2', 'Series 3'],
106106
[8, 'Program 1', 'Series 2'],
107107
[8, 'Program 1', 'Series 6'],
@@ -143,7 +143,7 @@
143143
create(:series, name: 'Series 2', program: program_one, episodes: 1, watched: 1)
144144
create(:series, name: 'Series 1', program: program_two, episodes: 1, watched: 1)
145145

146-
expect(described_class.incomplete.map { [_1.program_name, _1.name] }).to eq [
146+
expect(described_class.incomplete.map { [it.program_name, it.name] }).to eq [
147147
['Program 1', 'Series 2'],
148148
['Program 2', 'Series 1'],
149149
['Program 2', 'Series 3']
@@ -186,7 +186,7 @@
186186
create(:episode, series: series_two, status:)
187187
create(:episode, series: series_three, status:)
188188

189-
expect(described_class.list_by_status(status).map { [_1.program_name, _1.name] }).to eq [
189+
expect(described_class.list_by_status(status).map { [it.program_name, it.name] }).to eq [
190190
['Program 1', 'Series 2'],
191191
['Program 2', 'Series 1'],
192192
['Program 2', 'Series 3']

0 commit comments

Comments
 (0)