Merge pull request #2792 from alphagov/dependabot/bundler/rubocop-gov…

…uk-4.13.0

Bump rubocop-govuk from 4.12.0 to 4.13.0

Gemfile.lock

@@ -199,7 +199,7 @@ GEM
       rdoc
       reline (>= 0.3.8)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     json-schema (4.1.1)
       addressable (>= 2.8)
     jwt (2.7.1)
@@ -450,8 +450,8 @@ GEM
     opentelemetry-semantic_conventions (1.10.0)
       opentelemetry-api (~> 1.0)
     os (1.1.4)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    parallel (1.24.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     plek (5.0.0)
@@ -514,7 +514,7 @@ GEM
     redis (4.8.1)
     redis-namespace (1.11.0)
       redis (>= 4)
-    regexp_parser (2.8.1)
+    regexp_parser (2.8.3)
     reline (0.4.1)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -543,37 +543,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.55.0)
+    rubocop (1.59.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
+    rubocop-factory_bot (2.24.0)
       rubocop (~> 1.33)
-    rubocop-govuk (4.12.0)
-      rubocop (= 1.55.0)
-      rubocop-ast (= 1.29.0)
-      rubocop-rails (= 2.20.2)
+    rubocop-govuk (4.13.0)
+      rubocop (= 1.59.0)
+      rubocop-ast (= 1.30.0)
+      rubocop-rails (= 2.23.0)
       rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.22.0)
-    rubocop-rails (2.20.2)
+      rubocop-rspec (= 2.25.0)
+    rubocop-rails (2.23.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
@@ -628,7 +629,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)

lib/indexer/bulk_payload_generator.rb

@@ -45,7 +45,7 @@ def index_action(doc_hash)
       {
         "index" => {
           "_type" => "generic-document",
-          "_id" => (doc_hash["_id"] || doc_hash["link"]),
+          "_id" => doc_hash["_id"] || doc_hash["link"],
         },
       }
     end

lib/parameter_parser/aggregate_parameter_parser.rb

@@ -96,7 +96,7 @@ def order
       ALLOWED_AGGREGATE_SORT_OPTIONS.include?(option)
     end
 
-    invalid_orders.each do |option, _|
+    invalid_orders.each do |(option, _)|
       @errors << %("#{option}" is not a valid sort option#{aggregate_description})
     end
 

lib/parameter_parser/aggregates_parameter_parser.rb

@@ -11,7 +11,7 @@ def initialize(params, allowed_return_fields)
   end
 
   def call
-    @params.each do |key, _values|
+    @params.each_key do |key|
       # to ensure backwards compatibility we will support both facet_* and aggregate_* style naming
       # - all aggregations in the request must use the same naming format
       matches = key.match(/\A(facet|aggregate)_(.*)\Z/)

lib/schema/index_schema.rb

@@ -13,7 +13,7 @@ def es_mappings
     properties = {
       "document_type" => @document_type_field,
     }
-    @elasticsearch_types.each do |_key, value|
+    @elasticsearch_types.each_value do |value|
       properties = properties.merge(value.es_config)
     end
     {

spec/unit/result_set_presenter_spec.rb

@@ -122,7 +122,7 @@ def search_presenter(options)
     end
 
     it "have only the fields returned from search engine" do
-      @output[:results].zip(sample_docs).each do |result, _doc|
+      @output[:results].zip(sample_docs).each do |(result, _)|
         doc_fields = result.keys - %i[_type _id]
         returned_fields = result.keys - %i[esscore _type _id]
         expect(doc_fields).to eq(returned_fields)
@@ -198,7 +198,7 @@ def search_presenter(options)
     end
 
     it "have only the fields returned from search engine" do
-      @output[:results].zip(sample_docs).each do |result, _doc|
+      @output[:results].zip(sample_docs).each do |(result, _)|
         doc_fields = result.keys - %i[_type _id]
         returned_fields = result.keys - %i[esscore _type _id]
         expect(doc_fields).to eq(returned_fields)