Skip to content

Commit f7941a7

Browse files
authored
Merge pull request #630 from Shopify/dependabot/bundler/rubocop-1.63.0
2 parents b6926c6 + 17cf184 commit f7941a7

File tree

3 files changed

+30
-5
lines changed

3 files changed

+30
-5
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ GEM
1212
byebug (11.1.3)
1313
coderay (1.1.3)
1414
diffy (3.4.2)
15-
json (2.7.1)
15+
json (2.7.2)
1616
language_server-protocol (3.17.0.3)
1717
method_source (1.0.0)
1818
minitest (5.22.3)
@@ -31,7 +31,7 @@ GEM
3131
rake (13.2.1)
3232
regexp_parser (2.9.0)
3333
rexml (3.2.6)
34-
rubocop (1.62.1)
34+
rubocop (1.63.0)
3535
json (~> 2.3)
3636
language_server-protocol (>= 3.17.0)
3737
parallel (~> 1.10)

rubocop.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,11 @@ Style/MagicCommentFormat:
613613
Style/MapCompactWithConditionalBlock:
614614
Enabled: false
615615

616+
<% if rubocop_version >= "1.63" %>
617+
Style/MapIntoArray:
618+
Enabled: false
619+
<% end %>
620+
616621
Style/MapToHash:
617622
Enabled: false
618623

test/fixtures/full_config.yml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ AllCops:
8686
- rails
8787
rubocop-rspec:
8888
- rspec
89-
- rspec-rails
9089
rubocop-minitest:
9190
- minitest
9291
rubocop-sequel:
@@ -100,6 +99,8 @@ AllCops:
10099
rubocop-factory_bot:
101100
- factory_bot
102101
- factory_bot_rails
102+
rubocop-rspec_rails:
103+
- rspec-rails
103104
ActiveSupportExtensionsEnabled: false
104105
Bundler/DuplicatedGem:
105106
Description: Checks for duplicate gem entries in Gemfile.
@@ -1166,7 +1167,7 @@ Lint/Debugger:
11661167
Description: Check for debugger calls.
11671168
Enabled: true
11681169
VersionAdded: '0.14'
1169-
VersionChanged: '1.46'
1170+
VersionChanged: '1.63'
11701171
DebuggerMethods:
11711172
Kernel:
11721173
- binding.irb
@@ -1177,8 +1178,14 @@ Lint/Debugger:
11771178
- Kernel.byebug
11781179
- Kernel.remote_byebug
11791180
Capybara:
1181+
- page.save_and_open_page
1182+
- page.save_and_open_screenshot
1183+
- page.save_page
1184+
- page.save_screenshot
11801185
- save_and_open_page
11811186
- save_and_open_screenshot
1187+
- save_page
1188+
- save_screenshot
11821189
debug.rb:
11831190
- binding.b
11841191
- binding.break
@@ -1200,6 +1207,11 @@ Lint/Debugger:
12001207
- jard
12011208
WebConsole:
12021209
- binding.console
1210+
DebuggerRequires:
1211+
debug.rb:
1212+
- debug/open
1213+
- debug/open_nonstop
1214+
- debug/start
12031215
Lint/DeprecatedClassMethods:
12041216
Description: Check for deprecated class method calls.
12051217
Enabled: true
@@ -2071,7 +2083,8 @@ Naming/FileName:
20712083
Enabled: true
20722084
VersionAdded: '0.50'
20732085
VersionChanged: '1.23'
2074-
Exclude: []
2086+
Exclude:
2087+
- "/Rakefile.rb"
20752088
ExpectMatchingDefinition: false
20762089
CheckDefinitionPathHierarchy: true
20772090
CheckDefinitionPathHierarchyRoots:
@@ -3201,6 +3214,13 @@ Style/MapCompactWithConditionalBlock:
32013214
Description: Prefer `select` or `reject` over `map { ... }.compact`.
32023215
Enabled: false
32033216
VersionAdded: '1.30'
3217+
Style/MapIntoArray:
3218+
Description: Checks for usages of `each` with `<<`, `push`, or `append` which can
3219+
be replaced by `map`.
3220+
StyleGuide: "#functional-code"
3221+
Enabled: false
3222+
VersionAdded: '1.63'
3223+
Safe: false
32043224
Style/MapToHash:
32053225
Description: Prefer `to_h` with a block over `map.to_h`.
32063226
Enabled: false

0 commit comments

Comments
 (0)