Merge pull request #1760 from alphagov/dependabot/bundler/rubocop-govuk-3.10.0

Author: benthorner

Gemfile.lock

@@ -134,7 +134,6 @@ GEM
       concurrent-ruby (~> 1.0)
     image_size (2.0.2)
     io-like (0.3.0)
-    jaro_winkler (1.5.4)
     jasmine-core (3.5.0)
     jasmine-rails (0.15.0)
       jasmine-core (>= 1.3, < 4.0)
@@ -250,16 +249,15 @@ GEM
     rexml (3.2.4)
     robotex (1.0.0)
     rouge (3.18.0)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.83.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-govuk (3.9.0)
-      rubocop (= 0.82.0)
+    rubocop-govuk (3.10.0)
+      rubocop (= 0.83.0)
       rubocop-rails (~> 2)
       rubocop-rake (~> 0.5.1)
       rubocop-rspec (~> 1.28)

app/controllers/content_items_controller.rb

@@ -63,9 +63,11 @@ def load_content_item
       content_item["links"]["ordered_related_items"] = content_item["links"].fetch("suggested_ordered_related_items", [])
     end
 
-    @content_item = PresenterBuilder.new(content_item,
-                                         content_item_path,
-                                         view_context).presenter
+    @content_item = PresenterBuilder.new(
+      content_item,
+      content_item_path,
+      view_context,
+    ).presenter
   end
 
   def format_banner_links(links, type)
@@ -125,8 +127,10 @@ def set_use_recommended_related_links_header
   end
 
   def set_expiry
-    expires_in(@content_item.cache_control_max_age(request.format),
-               public: @content_item.cache_control_public?)
+    expires_in(
+      @content_item.cache_control_max_age(request.format),
+      public: @content_item.cache_control_public?,
+    )
   end
 
   def service_url(original_url)

app/controllers/development_controller.rb

@@ -2,12 +2,30 @@ class DevelopmentController < ApplicationController
   layout false
 
   def index
-    @schema_names = %w[answer case_study coming_soon consultation contact
-                       corporate_information_page detailed_guide document_collection
-                       fatality_notice guide help_page html_publication news_article
-                       placeholder_corporate_information_page publication service_sign_in specialist_document
-                       speech statistical_data_set statistics_announcement take_part
-                       topical_event_about_page travel_advice working_group
+    @schema_names = %w[answer
+                       case_study
+                       coming_soon
+                       consultation
+                       contact
+                       corporate_information_page
+                       detailed_guide
+                       document_collection
+                       fatality_notice
+                       guide
+                       help_page
+                       html_publication
+                       news_article
+                       placeholder_corporate_information_page
+                       publication
+                       service_sign_in
+                       specialist_document
+                       speech
+                       statistical_data_set
+                       statistics_announcement
+                       take_part
+                       topical_event_about_page
+                       travel_advice
+                       working_group
                        world_location_news_article]
 
     @paths = YAML.load_file("test/wraith/config.yaml")["paths"]

app/presenters/content_item/corporate_information_groups.rb

@@ -9,18 +9,22 @@ def corporate_information?
     def corporate_information
       corporate_information_groups.map do |group|
         {
-          heading: view_context.content_tag(:h3,
-                                            group["name"],
-                                            id: group_title_id(group["name"])),
+          heading: view_context.content_tag(
+            :h3,
+            group["name"],
+            id: group_title_id(group["name"]),
+          ),
           links: normalised_group_links(group),
         }
       end
     end
 
     def corporate_information_heading_tag
-      view_context.content_tag(:h2,
-                               corporate_information_heading[:text],
-                               id: corporate_information_heading[:id])
+      view_context.content_tag(
+        :h2,
+        corporate_information_heading[:text],
+        id: corporate_information_heading[:id],
+      )
     end
 
     def further_information

app/presenters/content_item/national_applicability.rb

@@ -3,7 +3,7 @@ module NationalApplicability
     include Metadata
 
     def applies_to
-      return nil if !national_applicability
+      return nil unless national_applicability
 
       all_nations = national_applicability.values
       applicable_nations = all_nations.select { |n| n["applicable"] }

app/presenters/content_item/withdrawable.rb

@@ -33,9 +33,11 @@ def withdrawal_notice_context
     end
 
     def withdrawal_notice_time
-      view_context.content_tag(:time,
-                               english_display_date(withdrawal_notice["withdrawn_at"]),
-                               datetime: withdrawal_notice["withdrawn_at"])
+      view_context.content_tag(
+        :time,
+        english_display_date(withdrawal_notice["withdrawn_at"]),
+        datetime: withdrawal_notice["withdrawn_at"],
+      )
     end
 
     def english_display_date(timestamp, format = "%-d %B %Y")

app/presenters/document_collection_presenter.rb

@@ -41,9 +41,11 @@ def group_document_links(group, group_index)
         },
         metadata: {
           public_updated_at: link["public_updated_at"]&.then { |time| Time.zone.parse(time) },
-          document_type: I18n.t("content_item.schema_name.#{link['document_type']}",
-                                count: 1,
-                                default: nil),
+          document_type: I18n.t(
+            "content_item.schema_name.#{link['document_type']}",
+            count: 1,
+            default: nil,
+          ),
         },
       }
     end
@@ -52,10 +54,12 @@ def group_document_links(group, group_index)
   def group_heading(group)
     title = group["title"]
     heading_level = show_contents_list? ? :h3 : :h2
-    view_context.content_tag(heading_level,
-                             title,
-                             class: "group-title",
-                             id: group_title_id(title))
+    view_context.content_tag(
+      heading_level,
+      title,
+      class: "group-title",
+      id: group_title_id(title),
+    )
   end
 
 private

app/presenters/specialist_document_presenter.rb

@@ -170,9 +170,11 @@ def facet_block(facet, allowed_value)
 
   def facet_link(label, value, key)
     finder_base_path = finder["base_path"]
-    view_context.link_to(label,
-                         "#{finder_base_path}?#{key}%5B%5D=#{value}",
-                         class: "govuk-link app-link")
+    view_context.link_to(
+      label,
+      "#{finder_base_path}?#{key}%5B%5D=#{value}",
+      class: "govuk-link app-link",
+    )
   end
 
   def first_published_at_facet_key

app/services/presenter_builder.rb

@@ -12,9 +12,11 @@ def presenter
     raise RedirectRouteReturned, content_item if redirect_route?
     raise GovernmentReturned if government_content_item?
 
-    presenter_name.constantize.new(content_item,
-                                   content_item_path,
-                                   view_context)
+    presenter_name.constantize.new(
+      content_item,
+      content_item_path,
+      view_context,
+    )
   end
 
 private

config/application.rb

@@ -30,12 +30,67 @@ class Application < Rails::Application
 
     # Explicitly set available locales
     config.i18n.available_locales = [
-      :en, :ar, :az, :be, :bg, :bn, :cs, :cy, :da, :de, :dr, :el,
-      :es, "es-419", :et, :fa, :fi, :fr, :gd, :he, :hi, :hr, :hu,
-      :hy, :id, :is, :it, :ja, :ka, :kk, :ko, :lt, :lv, :ms, :mt,
-      :no, :nl, :pl, :ps, :pt, :ro, :ru, :si, :sk, :sl, :so, :sq,
-      :sr, :sv, :sw, :ta, :th, :tk, :tr, :uk, :ur, :uz, :vi, :zh,
-      "zh-hk",  "zh-tw"
+      :en,
+      :ar,
+      :az,
+      :be,
+      :bg,
+      :bn,
+      :cs,
+      :cy,
+      :da,
+      :de,
+      :dr,
+      :el,
+      :es,
+      "es-419",
+      :et,
+      :fa,
+      :fi,
+      :fr,
+      :gd,
+      :he,
+      :hi,
+      :hr,
+      :hu,
+      :hy,
+      :id,
+      :is,
+      :it,
+      :ja,
+      :ka,
+      :kk,
+      :ko,
+      :lt,
+      :lv,
+      :ms,
+      :mt,
+      :no,
+      :nl,
+      :pl,
+      :ps,
+      :pt,
+      :ro,
+      :ru,
+      :si,
+      :sk,
+      :sl,
+      :so,
+      :sq,
+      :sr,
+      :sv,
+      :sw,
+      :ta,
+      :th,
+      :tk,
+      :tr,
+      :uk,
+      :ur,
+      :uz,
+      :vi,
+      :zh,
+      "zh-hk",
+      "zh-tw",
     ]
 
     # Enable locale fallbacks for I18n (makes lookups for any locale fall back to

lib/helpers/document_types_helper.rb

@@ -9,13 +9,13 @@ def initialize(sample_size = 10)
   end
 
   def all_type_paths
-    response = RestClient.get(format(ALL_SEARCH_ENDPOINT, sample_size: @sample_size))
+    response = RestClient.get(sprintf(ALL_SEARCH_ENDPOINT, sample_size: @sample_size))
     results = extract_results(JSON.parse(response.body))
     results.map { |result| extract_type(result) }.reduce({}, :merge)
   end
 
   def type_paths(type)
-    response = RestClient.get(format(SINGLE_SEARCH_ENDPOINT, document_type: type, sample_size: @sample_size))
+    response = RestClient.get(sprintf(SINGLE_SEARCH_ENDPOINT, document_type: type, sample_size: @sample_size))
     JSON.parse(response.body)["results"].map { |result| result["link"] }
   end
 

lib/helpers/wraith_config_helper.rb

@@ -44,7 +44,7 @@ def path_index(prefix, index)
   end
 
   def write_config(config)
-    file_name = format(OUTPUT_PATH, suffix: @name)
+    file_name = sprintf(OUTPUT_PATH, suffix: @name)
     File.open(file_name, "w") { |f| f.write config.to_yaml }
     file_name
   end

test/components/banner_test.rb

@@ -32,9 +32,11 @@ def component_name
   end
 
   test "renders a banner with title, text and aside correctly" do
-    render_component(title: "Summary",
-                     text: "This was published under the 2010 to 2015 Conservative government",
-                     aside: "This consultation ran from 9:30am on 30 January 2017 to 5pm on 28 February 2017")
+    render_component(
+      title: "Summary",
+      text: "This was published under the 2010 to 2015 Conservative government",
+      aside: "This consultation ran from 9:30am on 30 January 2017 to 5pm on 28 February 2017",
+    )
 
     assert_select ".app-c-banner--aside"
     assert_select ".app-c-banner__title", text: "Summary"

test/components/published_dates_test.rb

@@ -16,7 +16,8 @@ def component_name
 
   test "renders published date and last updated date" do
     render_component(published: "1st November 2000", last_updated: "15th July 2015")
-    assert_select ".app-c-published-dates", text: "Published 1st November 2000
+    assert_select ".app-c-published-dates",
+                  text: "Published 1st November 2000
     Last updated 15th July 2015"
   end
 

test/controllers/content_items_controller_test.rb

@@ -90,9 +90,10 @@ class ContentItemsControllerTest < ActionController::TestCase
     request.headers["Accept"] = "*/*"
     content_item = content_store_has_schema_example("travel_advice", "full-country")
 
-    get :show, params: {
-      path: path_for(content_item),
-    }
+    get :show,
+        params: {
+          path: path_for(content_item),
+        }
 
     assert_match(/text\/html/, response.headers["Content-Type"])
     assert_response :success
@@ -103,9 +104,10 @@ class ContentItemsControllerTest < ActionController::TestCase
     request.headers["X-Requested-With"] = "XMLHttpRequest"
     content_item = content_store_has_schema_example("case_study", "case_study")
 
-    get :show, params: {
-      path: path_for(content_item),
-    }
+    get :show,
+        params: {
+          path: path_for(content_item),
+        }
 
     assert_response :not_acceptable
   end
@@ -114,9 +116,10 @@ class ContentItemsControllerTest < ActionController::TestCase
     request.headers["Accept"] = "text/javascript"
     content_item = content_store_has_schema_example("case_study", "case_study")
 
-    get :show, params: {
-      path: path_for(content_item),
-    }
+    get :show,
+        params: {
+          path: path_for(content_item),
+        }
 
     assert_response :not_acceptable
   end

test/integration/specialist_document_test.rb

@@ -173,7 +173,9 @@ def assert_nested_content_item(heading)
   test "renders a link to statutory instruments finder" do
     setup_and_visit_content_item("eu-withdrawal-act-2018-statutory-instruments")
 
-    assert page.has_css?("a[href='/eu-withdrawal-act-2018-statutory-instruments']",
-                         text: "See all EU Withdrawal Act 2018 statutory instruments")
+    assert page.has_css?(
+      "a[href='/eu-withdrawal-act-2018-statutory-instruments']",
+      text: "See all EU Withdrawal Act 2018 statutory instruments",
+    )
   end
 end

test/presenter_test_helper.rb

@@ -18,8 +18,10 @@ def presented_item(type = schema_name, overrides = {})
   end
 
   def present_example(example)
-    create_presenter("#{schema_name.classify}Presenter".safe_constantize,
-                     content_item: example)
+    create_presenter(
+      "#{schema_name.classify}Presenter".safe_constantize,
+      content_item: example,
+    )
   end
 
   def schema_item(type = schema_name)