Merge pull request #5880 from consuldemocracy/dependabot/bundler/rubocop-1.71.2

Bump rubocop from 1.66.1 to 1.71.2

.rubocop.yml

@@ -284,6 +284,9 @@ Lint/BooleanSymbol:
 Lint/ConstantDefinitionInBlock:
   Enabled: true
 
+Lint/ConstantReassignment:
+  Enabled: true
+
 Lint/DeprecatedClassMethods:
   Enabled: true
 
@@ -299,6 +302,9 @@ Lint/EmptyBlock:
 Lint/EmptyFile:
   Enabled: true
 
+Lint/HashNewWithKeywordArgumentsAsDefault:
+  Enabled: true
+
 Lint/LiteralAsCondition:
   Enabled: true
 
@@ -308,6 +314,9 @@ Lint/NonAtomicFileOperation:
 Lint/ParenthesesAsGroupedExpression:
   Enabled: true
 
+Lint/RedundantSafeNavigation:
+  Enabled: true
+
 Lint/RedundantStringCoercion:
   Enabled: true
 
@@ -317,6 +326,9 @@ Lint/SafeNavigationChain:
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
 
+Lint/SharedMutableDefault:
+  Enabled: true
+
 Lint/SymbolConversion:
   Enabled: true
   Exclude:
@@ -326,6 +338,9 @@ Lint/SymbolConversion:
 Lint/UselessAssignment:
   Enabled: true
 
+Lint/UselessDefined:
+  Enabled: true
+
 Lint/Void:
   Enabled: true
 
@@ -705,6 +720,9 @@ Style/ClassVars:
 Style/CollectionMethods:
   Enabled: true
 
+Style/DigChain:
+  Enabled: true
+
 Style/FileRead:
   Enabled: true
 
@@ -717,9 +735,11 @@ Style/HashConversion:
 Style/HashExcept:
   Enabled: true
 
+Style/HashSlice:
+  Enabled: true
+
 Style/HashSyntax:
   Enabled: true
-  EnforcedShorthandSyntax: either
 
 Style/HashTransformKeys:
   Enabled: true
@@ -744,6 +764,9 @@ Style/InvertibleUnlessCondition:
     :present?: :blank?
     :zero?: ~
 
+Style/KeywordArgumentsMerging:
+  Enabled: true
+
 Style/LineEndConcatenation:
   Enabled: true
 

Gemfile

@@ -101,7 +101,7 @@ group :development do
   gem "pronto-eslint", "~> 0.11.1", require: false
   gem "pronto-rubocop", "~> 0.11.6", require: false
   gem "pronto-stylelint", "~> 0.11.0", require: false
-  gem "rubocop", "~> 1.66.1", require: false
+  gem "rubocop", "~> 1.71.2", require: false
   gem "rubocop-capybara", "~> 2.21.0", require: false
   gem "rubocop-factory_bot", "~> 2.26.1", require: false
   gem "rubocop-performance", "~> 1.23.1", require: false

Gemfile.lock

@@ -553,16 +553,16 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.66.1)
+    rubocop (1.71.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
     rubocop-ast (1.38.1)
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
@@ -786,7 +786,7 @@ DEPENDENCIES
   rinku (~> 2.0.6)
   ros-apartment (~> 2.11.0)
   rspec-rails (~> 7.0.1)
-  rubocop (~> 1.66.1)
+  rubocop (~> 1.71.2)
   rubocop-capybara (~> 2.21.0)
   rubocop-factory_bot (~> 2.26.1)
   rubocop-performance (~> 1.23.1)

app/components/admin/allowed_table_actions_component.rb

@@ -15,6 +15,6 @@ class Admin::AllowedTableActionsComponent < ApplicationComponent
     end
 
     def table_actions_component
-      @table_actions_component ||= Admin::TableActionsComponent.new(record, **options.merge(actions: actions))
+      @table_actions_component ||= Admin::TableActionsComponent.new(record, **options, actions: actions)
     end
 end

app/components/admin/table_actions_component.html.erb

@@ -2,10 +2,10 @@
   <%= content %>
 
   <% if actions.include?(:edit) %>
-    <%= action(:edit, **edit_options.merge(text: edit_text, path: edit_path)) %>
+    <%= action(:edit, **edit_options, text: edit_text, path: edit_path) %>
   <% end %>
 
   <% if actions.include?(:destroy) %>
-    <%= action(:destroy, **destroy_options.merge(text: destroy_text, path: destroy_path)) %>
+    <%= action(:destroy, **destroy_options, text: destroy_text, path: destroy_path) %>
   <% end %>
 </div>

app/controllers/legislation/annotations_controller.rb

@@ -101,7 +101,7 @@ class Legislation::AnnotationsController < Legislation::BaseController
 
     def convert_ranges_parameters
       annotation = params[:legislation_annotation]
-      if annotation && annotation[:ranges] && annotation[:ranges].is_a?(String)
+      if annotation && annotation[:ranges].is_a?(String)
         params[:legislation_annotation][:ranges] = JSON.parse(annotation[:ranges])
       end
     rescue JSON::ParserError

spec/support/matchers/have_avatar.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :have_avatar do |text, **options|
   match do |page|
-    page.has_css?("svg.initialjs-avatar", **{ exact_text: text }.merge(options))
+    page.has_css?("svg.initialjs-avatar", **{ exact_text: text }, **options)
   end
 
   failure_message do