Skip to content

Commit

Permalink
Merge pull request #630 from Shopify/dependabot/bundler/rubocop-1.63.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sambostock committed May 6, 2024
2 parents b6926c6 + 17cf184 commit f7941a7
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GEM
byebug (11.1.3)
coderay (1.1.3)
diffy (3.4.2)
json (2.7.1)
json (2.7.2)
language_server-protocol (3.17.0.3)
method_source (1.0.0)
minitest (5.22.3)
Expand All @@ -31,7 +31,7 @@ GEM
rake (13.2.1)
regexp_parser (2.9.0)
rexml (3.2.6)
rubocop (1.62.1)
rubocop (1.63.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand Down
5 changes: 5 additions & 0 deletions rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,11 @@ Style/MagicCommentFormat:
Style/MapCompactWithConditionalBlock:
Enabled: false

<% if rubocop_version >= "1.63" %>
Style/MapIntoArray:
Enabled: false
<% end %>

Style/MapToHash:
Enabled: false

Expand Down
26 changes: 23 additions & 3 deletions test/fixtures/full_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ AllCops:
- rails
rubocop-rspec:
- rspec
- rspec-rails
rubocop-minitest:
- minitest
rubocop-sequel:
Expand All @@ -100,6 +99,8 @@ AllCops:
rubocop-factory_bot:
- factory_bot
- factory_bot_rails
rubocop-rspec_rails:
- rspec-rails
ActiveSupportExtensionsEnabled: false
Bundler/DuplicatedGem:
Description: Checks for duplicate gem entries in Gemfile.
Expand Down Expand Up @@ -1166,7 +1167,7 @@ Lint/Debugger:
Description: Check for debugger calls.
Enabled: true
VersionAdded: '0.14'
VersionChanged: '1.46'
VersionChanged: '1.63'
DebuggerMethods:
Kernel:
- binding.irb
Expand All @@ -1177,8 +1178,14 @@ Lint/Debugger:
- Kernel.byebug
- Kernel.remote_byebug
Capybara:
- page.save_and_open_page
- page.save_and_open_screenshot
- page.save_page
- page.save_screenshot
- save_and_open_page
- save_and_open_screenshot
- save_page
- save_screenshot
debug.rb:
- binding.b
- binding.break
Expand All @@ -1200,6 +1207,11 @@ Lint/Debugger:
- jard
WebConsole:
- binding.console
DebuggerRequires:
debug.rb:
- debug/open
- debug/open_nonstop
- debug/start
Lint/DeprecatedClassMethods:
Description: Check for deprecated class method calls.
Enabled: true
Expand Down Expand Up @@ -2071,7 +2083,8 @@ Naming/FileName:
Enabled: true
VersionAdded: '0.50'
VersionChanged: '1.23'
Exclude: []
Exclude:
- "/Rakefile.rb"
ExpectMatchingDefinition: false
CheckDefinitionPathHierarchy: true
CheckDefinitionPathHierarchyRoots:
Expand Down Expand Up @@ -3201,6 +3214,13 @@ Style/MapCompactWithConditionalBlock:
Description: Prefer `select` or `reject` over `map { ... }.compact`.
Enabled: false
VersionAdded: '1.30'
Style/MapIntoArray:
Description: Checks for usages of `each` with `<<`, `push`, or `append` which can
be replaced by `map`.
StyleGuide: "#functional-code"
Enabled: false
VersionAdded: '1.63'
Safe: false
Style/MapToHash:
Description: Prefer `to_h` with a block over `map.to_h`.
Enabled: false
Expand Down

0 comments on commit f7941a7

Please sign in to comment.