Skip to content

Commit 1d7a0ad

Browse files
committed
bump rubocop
refs AE-1787
1 parent 0e28f46 commit 1d7a0ad

19 files changed

+295
-264
lines changed

.github/workflows/continuous_integration.yml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ jobs:
1818
TEST_DB_PASSWORD: postgres
1919

2020
strategy:
21+
fail-fast: false
2122
matrix:
2223
ruby: ['3.1', '3.2', '3.3']
2324
lockfile: ['activerecord-7.0', 'Gemfile.lock']

.rubocop.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require:
1+
plugins:
22
- rubocop-rails
33
- rubocop-rake
44

@@ -8,6 +8,7 @@ inherit_gem:
88
- rubocop-rspec.yml # if you use rspec and rubocop-rspec
99

1010
AllCops:
11+
TargetRailsVersion: 7.0
1112
TargetRubyVersion: 3.1
1213
Exclude:
1314
- vendor/**/*
@@ -31,6 +32,10 @@ Naming/FileName:
3132

3233
Rails/ApplicationRecord:
3334
Enabled: false
35+
Rails/Delegate:
36+
Exclude:
37+
- db/migrate/*
38+
- spec/spec_helper.rb
3439
Rails/Exit:
3540
Enabled: false
3641
Rails/HttpPositionalArguments:

Dockerfile.ci

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG RUBY_VERSION=3.4
1+
ARG RUBY_VERSION=3.1
22
FROM ruby:${RUBY_VERSION}
33

44
RUN apt-get update && apt-get install -y git

Gemfile.activerecord-7.0.lock

+121-106
Original file line numberDiff line numberDiff line change
@@ -31,69 +31,78 @@ GEM
3131
activerecord (7.0.8)
3232
activemodel (= 7.0.8)
3333
activesupport (= 7.0.8)
34-
activerecord-pg-extensions (0.5.4)
35-
activerecord (>= 7.0, < 7.2)
36-
railties (>= 7.0, < 7.2)
34+
activerecord-pg-extensions (0.6.0)
35+
activerecord (>= 7.0, < 8.1)
36+
railties (>= 7.0, < 8.1)
3737
activesupport (7.0.8)
3838
concurrent-ruby (~> 1.0, >= 1.0.2)
3939
i18n (>= 1.6, < 2)
4040
minitest (>= 5.1)
4141
tzinfo (~> 2.0)
42-
addressable (2.8.5)
43-
public_suffix (>= 2.0.2, < 6.0)
42+
addressable (2.8.7)
43+
public_suffix (>= 2.0.2, < 7.0)
4444
after_transaction_commit (2.2.2)
4545
activerecord (>= 5.2)
4646
ast (2.4.2)
47-
base64 (0.1.1)
48-
builder (3.2.4)
47+
base64 (0.2.0)
48+
bigdecimal (3.1.9)
49+
builder (3.3.0)
4950
bump (0.10.0)
50-
concurrent-ruby (1.2.2)
51-
crack (0.4.5)
51+
concurrent-ruby (1.3.5)
52+
crack (1.0.0)
53+
bigdecimal
5254
rexml
5355
crass (1.0.6)
54-
database_cleaner (2.0.2)
56+
database_cleaner (2.1.0)
5557
database_cleaner-active_record (>= 2, < 3)
56-
database_cleaner-active_record (2.1.0)
58+
database_cleaner-active_record (2.2.0)
5759
activerecord (>= 5.a)
5860
database_cleaner-core (~> 2.0.0)
5961
database_cleaner-core (2.0.1)
60-
debug (1.8.0)
61-
irb (>= 1.5.0)
62-
reline (>= 0.3.1)
63-
debug_inspector (1.1.0)
62+
date (3.4.1)
63+
debug (1.10.0)
64+
irb (~> 1.10)
65+
reline (>= 0.3.8)
66+
debug_inspector (1.2.0)
6467
deep_merge (1.2.2)
65-
diff-lcs (1.5.0)
68+
diff-lcs (1.6.0)
6669
diplomat (2.6.4)
6770
deep_merge (~> 1.2)
6871
faraday (>= 0.9, < 3.0, != 2.0.0)
69-
erubi (1.12.0)
70-
et-orbi (1.2.7)
72+
erubi (1.13.1)
73+
et-orbi (1.2.11)
7174
tzinfo
72-
faraday (2.7.11)
73-
base64
74-
faraday-net_http (>= 2.0, < 3.1)
75-
ruby2_keywords (>= 0.0.4)
76-
faraday-net_http (3.0.2)
77-
fugit (1.8.1)
78-
et-orbi (~> 1, >= 1.2.7)
75+
faraday (2.12.2)
76+
faraday-net_http (>= 2.0, < 3.5)
77+
json
78+
logger
79+
faraday-net_http (3.4.0)
80+
net-http (>= 0.5.0)
81+
fugit (1.11.1)
82+
et-orbi (~> 1, >= 1.2.11)
7983
raabro (~> 1.4)
80-
hashdiff (1.0.1)
81-
i18n (1.14.1)
84+
hashdiff (1.1.2)
85+
i18n (1.14.7)
8286
concurrent-ruby (~> 1.0)
83-
io-console (0.6.0)
84-
irb (1.8.1)
85-
rdoc
86-
reline (>= 0.3.8)
87-
json (2.6.3)
88-
language_server-protocol (3.17.0.3)
89-
loofah (2.22.0)
87+
io-console (0.8.0)
88+
irb (1.15.1)
89+
pp (>= 0.6.0)
90+
rdoc (>= 4.0.0)
91+
reline (>= 0.4.2)
92+
json (2.10.1)
93+
language_server-protocol (3.17.0.4)
94+
lint_roller (1.1.0)
95+
logger (1.6.6)
96+
loofah (2.24.0)
9097
crass (~> 1.0.2)
9198
nokogiri (>= 1.12.0)
9299
method_source (1.0.0)
93-
minitest (5.20.0)
100+
minitest (5.25.4)
94101
multi_json (1.15.0)
95-
mustermann (3.0.0)
102+
mustermann (3.0.3)
96103
ruby2_keywords (~> 0.0.1)
104+
net-http (0.6.0)
105+
uri
97106
nokogiri (1.18.3-aarch64-linux-gnu)
98107
racc (~> 1.4)
99108
nokogiri (1.18.3-arm64-darwin)
@@ -102,28 +111,33 @@ GEM
102111
racc (~> 1.4)
103112
nokogiri (1.18.3-x86_64-linux-gnu)
104113
racc (~> 1.4)
105-
parallel (1.23.0)
106-
parser (3.2.2.4)
114+
parallel (1.26.3)
115+
parser (3.3.7.1)
107116
ast (~> 2.4.1)
108117
racc
109-
pg (1.5.4)
110-
psych (5.1.0)
118+
pg (1.5.9)
119+
pp (0.6.2)
120+
prettyprint
121+
prettyprint (0.2.0)
122+
psych (5.2.3)
123+
date
111124
stringio
112-
public_suffix (5.0.3)
125+
public_suffix (6.0.1)
113126
raabro (1.4.0)
114-
racc (1.7.3)
115-
rack (2.2.8)
116-
rack-protection (3.1.0)
127+
racc (1.8.1)
128+
rack (2.2.11)
129+
rack-protection (3.2.0)
130+
base64 (>= 0.1.0)
117131
rack (~> 2.2, >= 2.2.4)
118-
rack-test (2.1.0)
132+
rack-test (2.2.0)
119133
rack (>= 1.3)
120134
rails-dom-testing (2.2.0)
121135
activesupport (>= 5.0.0)
122136
minitest
123137
nokogiri (>= 1.6)
124-
rails-html-sanitizer (1.6.0)
138+
rails-html-sanitizer (1.6.2)
125139
loofah (~> 2.21)
126-
nokogiri (~> 1.14)
140+
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)
127141
railties (7.0.8)
128142
actionpack (= 7.0.8)
129143
activesupport (= 7.0.8)
@@ -132,85 +146,86 @@ GEM
132146
thor (~> 1.0)
133147
zeitwerk (~> 2.5)
134148
rainbow (3.1.1)
135-
rake (13.0.6)
136-
rdoc (6.5.0)
149+
rake (13.2.1)
150+
rdoc (6.12.0)
137151
psych (>= 4.0.0)
138-
regexp_parser (2.8.1)
139-
reline (0.3.9)
152+
regexp_parser (2.10.0)
153+
reline (0.6.0)
140154
io-console (~> 0.5)
141-
rexml (3.2.6)
142-
rspec (3.12.0)
143-
rspec-core (~> 3.12.0)
144-
rspec-expectations (~> 3.12.0)
145-
rspec-mocks (~> 3.12.0)
146-
rspec-core (3.12.2)
147-
rspec-support (~> 3.12.0)
148-
rspec-expectations (3.12.3)
155+
rexml (3.4.1)
156+
rspec (3.13.0)
157+
rspec-core (~> 3.13.0)
158+
rspec-expectations (~> 3.13.0)
159+
rspec-mocks (~> 3.13.0)
160+
rspec-core (3.13.3)
161+
rspec-support (~> 3.13.0)
162+
rspec-expectations (3.13.3)
149163
diff-lcs (>= 1.2.0, < 2.0)
150-
rspec-support (~> 3.12.0)
151-
rspec-mocks (3.12.6)
164+
rspec-support (~> 3.13.0)
165+
rspec-mocks (3.13.2)
152166
diff-lcs (>= 1.2.0, < 2.0)
153-
rspec-support (~> 3.12.0)
154-
rspec-support (3.12.1)
155-
rubocop (1.56.4)
156-
base64 (~> 0.1.1)
167+
rspec-support (~> 3.13.0)
168+
rspec-support (3.13.2)
169+
rubocop (1.73.1)
157170
json (~> 2.3)
158-
language_server-protocol (>= 3.17.0)
171+
language_server-protocol (~> 3.17.0.2)
172+
lint_roller (~> 1.1.0)
159173
parallel (~> 1.10)
160-
parser (>= 3.2.2.3)
174+
parser (>= 3.3.0.2)
161175
rainbow (>= 2.2.2, < 4.0)
162-
regexp_parser (>= 1.8, < 3.0)
163-
rexml (>= 3.2.5, < 4.0)
164-
rubocop-ast (>= 1.28.1, < 2.0)
176+
regexp_parser (>= 2.9.3, < 3.0)
177+
rubocop-ast (>= 1.38.0, < 2.0)
165178
ruby-progressbar (~> 1.7)
166-
unicode-display_width (>= 2.4.0, < 3.0)
167-
rubocop-ast (1.29.0)
168-
parser (>= 3.2.1.0)
169-
rubocop-capybara (2.19.0)
170-
rubocop (~> 1.41)
171-
rubocop-factory_bot (2.24.0)
172-
rubocop (~> 1.33)
173-
rubocop-inst (1.0.2)
174-
rubocop (~> 1.50)
175-
rubocop-performance (~> 1.17)
176-
rubocop-performance (1.19.1)
177-
rubocop (>= 1.7.0, < 2.0)
178-
rubocop-ast (>= 0.4.0)
179-
rubocop-rails (2.21.2)
179+
unicode-display_width (>= 2.4.0, < 4.0)
180+
rubocop-ast (1.38.1)
181+
parser (>= 3.3.1.0)
182+
rubocop-inst (1.2.0)
183+
rubocop (~> 1.72, >= 1.72.1)
184+
rubocop-performance (~> 1.24)
185+
rubocop-performance (1.24.0)
186+
lint_roller (~> 1.1)
187+
rubocop (>= 1.72.1, < 2.0)
188+
rubocop-ast (>= 1.38.0, < 2.0)
189+
rubocop-rails (2.30.2)
180190
activesupport (>= 4.2.0)
191+
lint_roller (~> 1.1)
181192
rack (>= 1.1)
182-
rubocop (>= 1.33.0, < 2.0)
183-
rubocop-rake (0.6.0)
184-
rubocop (~> 1.0)
185-
rubocop-rspec (2.24.1)
186-
rubocop (~> 1.33)
187-
rubocop-capybara (~> 2.17)
188-
rubocop-factory_bot (~> 2.22)
193+
rubocop (>= 1.72.1, < 2.0)
194+
rubocop-ast (>= 1.38.0, < 2.0)
195+
rubocop-rake (0.7.1)
196+
lint_roller (~> 1.1)
197+
rubocop (>= 1.72.1)
198+
rubocop-rspec (3.5.0)
199+
lint_roller (~> 1.1)
200+
rubocop (~> 1.72, >= 1.72.1)
189201
ruby-progressbar (1.13.0)
190202
ruby2_keywords (0.0.5)
191-
sinatra (3.1.0)
203+
sinatra (3.2.0)
192204
mustermann (~> 3.0)
193205
rack (~> 2.2, >= 2.2.4)
194-
rack-protection (= 3.1.0)
206+
rack-protection (= 3.2.0)
195207
tilt (~> 2.0)
196-
sinatra-contrib (3.1.0)
197-
multi_json
208+
sinatra-contrib (3.2.0)
209+
multi_json (>= 0.0.2)
198210
mustermann (~> 3.0)
199-
rack-protection (= 3.1.0)
200-
sinatra (= 3.1.0)
211+
rack-protection (= 3.2.0)
212+
sinatra (= 3.2.0)
201213
tilt (~> 2.0)
202-
stringio (3.0.8)
203-
thor (1.3.0)
204-
tilt (2.3.0)
205-
timecop (0.9.8)
214+
stringio (3.1.5)
215+
thor (1.3.2)
216+
tilt (2.6.0)
217+
timecop (0.9.10)
206218
tzinfo (2.0.6)
207219
concurrent-ruby (~> 1.0)
208-
unicode-display_width (2.5.0)
209-
webmock (3.19.1)
220+
unicode-display_width (3.1.4)
221+
unicode-emoji (~> 4.0, >= 4.0.4)
222+
unicode-emoji (4.0.4)
223+
uri (1.0.3)
224+
webmock (3.25.0)
210225
addressable (>= 2.8.0)
211226
crack (>= 0.3.2)
212227
hashdiff (>= 0.4.0, < 2.0.0)
213-
zeitwerk (2.6.12)
228+
zeitwerk (2.6.18)
214229

215230
PLATFORMS
216231
aarch64-linux
@@ -238,9 +253,9 @@ DEPENDENCIES
238253
rubocop-inst (~> 1)
239254
rubocop-rails (~> 2.11)
240255
rubocop-rake (~> 0.6)
241-
rubocop-rspec (~> 2.4)
256+
rubocop-rspec (~> 3.0)
242257
sinatra
243-
sinatra-contrib
258+
sinatra-contrib (~> 3.1)
244259
timecop (~> 0.9)
245260
webmock
246261

0 commit comments

Comments
 (0)