Linting auto-correct

Author: Ben Thorner

Rakefile

@@ -10,7 +10,7 @@ unless Rails.env.production?
   require "scss_lint/rake_task"
 
   RuboCop::RakeTask.new(:rubocop) do |t|
-    t.patterns = %w(app config test Gemfile)
+    t.patterns = %w[app config test Gemfile]
   end
 
   SCSSLint::RakeTask.new do |t|

app/helpers/webchat_availability_helper.rb

@@ -1,11 +1,11 @@
 module WebchatAvailabilityHelper
   UNAVAILABILITY_MESSAGE = "This service will be unavailable from 4pm on Saturday 12 May to 9am on Monday 14 May.".freeze
-  HMRC_WEBCHAT_CONTACT_PATHS = %w(
+  HMRC_WEBCHAT_CONTACT_PATHS = %w[
     /government/organisations/hm-revenue-customs/contact/online-services-helpdesk
     /government/organisations/hm-revenue-customs/contact/income-tax-enquiries-for-individuals-pensioners-and-employees
     /government/organisations/hm-revenue-customs/contact/self-assessment
     /government/organisations/hm-revenue-customs/contact/tax-credits-enquiries
-  ).freeze
+  ].freeze
   UNAVAILABILITY_START = Time.zone.parse("2018-05-12 16:00 BST").freeze
   UNAVAILABILITY_END = Time.zone.parse("2018-05-14 09:00 BST").freeze
 

app/models/webchat.rb

@@ -3,7 +3,7 @@ class Webchat
 
   CONFIG_PATH = Rails.root.join("lib/webchat.yaml")
 
-  validates_presence_of :base_path, :open_url, :availability_url
+  validates :base_path, :open_url, :availability_url, presence: true
 
   attr_reader :base_path, :open_url, :availability_url, :open_url_redirect
 

app/presenters/consultation_presenter.rb

@@ -32,7 +32,7 @@ def open?
   end
 
   def closed?
-    %w(closed_consultation consultation_outcome).include? document_type
+    %w[closed_consultation consultation_outcome].include? document_type
   end
 
   def unopened?
@@ -127,7 +127,7 @@ def display_date_and_time(date, rollback_midnight = false)
       # 12am, 12:00am and "midnight on" can all be misinterpreted
       # Use 11:59pm on the day before to remove ambiguity
       # 12am on 10 January becomes 11:59pm on 9 January
-      time = time - 1.second if time.strftime(time_format) == "12:00am"
+      time -= 1.second if time.strftime(time_format) == "12:00am"
     end
     I18n.l(time, format: "#{time_format} on #{date_format}").gsub(":00", "").gsub("12pm", "midday").gsub("12am on ", "").strip
   end

app/presenters/contact_presenter.rb

@@ -140,7 +140,7 @@ def related_contacts_links
     related.map do |link|
       {
         title: link["title"],
-        url:  link["base_path"],
+        url: link["base_path"],
       }
     end
   end
@@ -150,7 +150,7 @@ def quick_links
     quick.map do |link|
       {
         title: link["title"],
-        url:  link["url"],
+        url: link["url"],
       }
     end
   end

app/presenters/content_item/contents_list.rb

@@ -49,7 +49,7 @@ def first_item_has_long_content?
     def first_item_content
       element = first_item
       first_item_text = ""
-      allowed_elements = %w(p ul ol)
+      allowed_elements = %w[p ul ol]
 
       until element.name == "h2"
         first_item_text += element.text if element.name.in?(allowed_elements)
@@ -70,7 +70,7 @@ def first_item_has_long_table?
     def find_first_table
       element = first_item
 
-      until element.name == "h2" do
+      until element.name == "h2"
         return element if element.name == "table"
 
         element = element.next_element

app/presenters/content_item/linkable.rb

@@ -3,19 +3,19 @@ module Linkable
     include ActionView::Helpers::UrlHelper
 
     def from
-      organisations_ordered_by_importance + links_group(%w{worldwide_organisations people speaker})
+      organisations_ordered_by_importance + links_group(%w[worldwide_organisations people speaker])
     end
 
     def part_of
-      links_group(%w{
+      links_group(%w[
         document_collections
         related_policies
         policies
         world_locations
         topics
         topical_events
         related_statistical_data_sets
-      })
+      ])
     end
 
   private

app/presenters/content_item/parts.rb

@@ -87,7 +87,7 @@ def part_links
       parts.map.with_index(1) do |part, position|
         if part["slug"] != current_part["slug"]
           link_to part["title"], part["full_path"], class: "govuk-link",
-            data: {
+                                                    data: {
             track_category: "contentsClicked",
             track_action: "content_item #{position}",
             track_label: part["full_path"],

app/presenters/travel_advice_presenter.rb

@@ -68,12 +68,12 @@ def print_link
   # Feature included as it _could_ still be used
   # Remove when alert status boxes no longer in travel advice publisher
   def alert_status
-    allowed_statuses = %w{
+    allowed_statuses = %w[
       avoid_all_but_essential_travel_to_parts
       avoid_all_travel_to_parts
       avoid_all_but_essential_travel_to_whole_country
       avoid_all_travel_to_whole_country
-    }
+    ]
     alert_statuses = content_item["details"]["alert_status"] || []
     alert_statuses = alert_statuses.map do |alert|
       if allowed_statuses.include?(alert)

config/application.rb

@@ -22,7 +22,7 @@ class Application < Rails::Application
     config.time_zone = "London"
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
+    config.autoload_paths += %W[#{config.root}/lib]
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]

config/initializers/assets.rb

@@ -8,7 +8,7 @@
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w(
+Rails.application.config.assets.precompile += %w[
   print.css
   webchat.js
-)
+]

config/locales/plurals.rb

@@ -1,26 +1,26 @@
 {
-  #Dari - this isn't an iso code. Probably should be 'prs' as per ISO 639-3.
+  # Dari - this isn't an iso code. Probably should be 'prs' as per ISO 639-3.
   dr: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Armenian
+  # Armenian
   hy: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Pushto
+  # Pushto
   ps: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Portugese
+  # Portugese
   pt: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Sinhalese
+  # Sinhalese
   si: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Somali
+  # Somali
   so: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Albanian
+  # Albanian
   sq: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Tamil
+  # Tamil
   ta: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Turkmen
+  # Turkmen
   tk: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Uzbek
+  # Uzbek
   uz: { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Chinese Hong Kong
+  # Chinese Hong Kong
   "zh-hk" => { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
-  #Chinese Taiwan
+  # Chinese Taiwan
   "zh-tw" => { i18n: { plural: { keys: %i[one other], rule: lambda { |n| n == 1 ? :one : :other } } } },
 }

config/spring.rb

@@ -1,6 +1,6 @@
-%w(
+%w[
   .ruby-version
   .rbenv-vars
   tmp/restart.txt
   tmp/caching-dev.txt
-).each { |path| Spring.watch(path) }
+].each { |path| Spring.watch(path) }

lib/helpers/wraith_config_helper.rb

@@ -20,7 +20,7 @@ def create_config(extra_config = {})
 private
 
   def load_template
-    YAML::safe_load(File.open(TEMPLATE_PATH))
+    YAML.safe_load(File.open(TEMPLATE_PATH))
   end
 
   def build_paths

test/components/banner_test.rb

@@ -33,8 +33,8 @@ def component_name
 
   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")
+                     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/controllers/content_items_controller_test.rb

@@ -257,7 +257,7 @@ class ContentItemsControllerTest < ActionController::TestCase
     get :show, params: { path: path_for(content_item, locale), locale: locale }
 
     assert_response :success
-    assert_select "title", %r(#{translated_schema_name})
+    assert_select "title", %r{#{translated_schema_name}}
   end
 
   test "renders atom feeds" do

test/controllers/step_navigation_controller_test.rb

@@ -3,7 +3,7 @@
 class ContentItemsControllerTest < ActionController::TestCase
   include GdsApi::TestHelpers::ContentStore
 
-  %w(guide answer publication).each do |schema_name|
+  %w[guide answer publication].each do |schema_name|
     test "#{schema_name} shows step by step navigation where relevant" do
       content_item = content_store_has_schema_example(schema_name, "#{schema_name}-with-step-navs")
       content_item["base_path"] = "/pass-plus"

test/helpers/application_helper_test.rb

@@ -4,12 +4,12 @@ class ApplicationHelperTest < ActionView::TestCase
   tests ApplicationHelper
 
   test "#current_path_without_query_string returns the path of the current request" do
-    self.stubs(:request).returns(ActionDispatch::TestRequest.create("PATH_INFO" => "/foo/bar"))
+    stubs(:request).returns(ActionDispatch::TestRequest.create("PATH_INFO" => "/foo/bar"))
     assert_equal "/foo/bar", current_path_without_query_string
   end
 
   test "#current_path_without_query_string returns the path of the current request stripping off any query string parameters" do
-    self.stubs(:request).returns(ActionDispatch::TestRequest.create("PATH_INFO" => "/foo/bar", "QUERY_STRING" => "ham=jam&spam=gram"))
+    stubs(:request).returns(ActionDispatch::TestRequest.create("PATH_INFO" => "/foo/bar", "QUERY_STRING" => "ham=jam&spam=gram"))
     assert_equal "/foo/bar", current_path_without_query_string
   end
 

test/integration/component_guide_test.rb

@@ -3,5 +3,5 @@
 
 class ComponentGuideTest < ActionDispatch::IntegrationTest
   # temporarily disabling to get around an error to do with an image in one of the component pages
-  #include GovukPublishingComponents::Minitest::ComponentGuideTest
+  # include GovukPublishingComponents::Minitest::ComponentGuideTest
 end

test/integration/consultation_test.rb

@@ -10,7 +10,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest
     assert_has_publisher_metadata(
       published: "Published 4 November 2016",
       last_updated: "Last updated 7 November 2016",
-      metadata:  {
+      metadata: {
         "From": { "Department for Education": "/government/organisations/department-for-education" },
       },
     )

test/integration/travel_advice_atom_feed_test.rb

@@ -27,7 +27,7 @@ class TravelAdviceAtomFeed < ActionDispatch::IntegrationTest
   end
 
   test "it sets the entry's summary correctly" do
-    summary = Nokogiri::HTML::fragment(@feed.items.first.summary.content)
+    summary = Nokogiri::HTML.fragment(@feed.items.first.summary.content)
     assert_equal summary.text.strip, @content_item["details"]["change_description"].strip
   end
 

test/presenters/contact_presenter_test.rb

@@ -38,7 +38,7 @@ def schema_name
       presented_post_address = presented_item.post[0]
       assert_equal post_address["description"].strip, presented_post_address[:description]
       rendered_presented_address = presented_post_address[:v_card].reduce("") { |acc, hash| acc << hash[:value].strip }
-      rendered_input_address = %w(title street_address locality region postal_code world_location).reduce("") do |acc, key|
+      rendered_input_address = %w[title street_address locality region postal_code world_location].reduce("") do |acc, key|
         acc << post_address[key].strip
       end
       assert_equal rendered_input_address, rendered_presented_address

test/presenters/content_item/linkable_test.rb

@@ -24,7 +24,7 @@ def initialize
     ]
 
     expected_from_links = [
-      %{<a class="govuk-link" href="/government/people/winston-churchill">Winston Churchill</a>},
+      %(<a class="govuk-link" href="/government/people/winston-churchill">Winston Churchill</a>),
     ]
     assert_equal expected_from_links, item.from
   end
@@ -55,7 +55,7 @@ def initialize
     ]
 
     expected_from_links = [
-      %{<a class=\"govuk-link\" href="/world/germany/news">Germany</a>},
+      %(<a class=\"govuk-link\" href="/world/germany/news">Germany</a>),
     ]
     assert_equal expected_from_links, item.part_of
   end

test/presenters/content_item/withdrawable_test.rb

@@ -70,8 +70,8 @@ def content_item
   end
 
   test "notice title presents only in English, even if locale is set to another language" do
-  # This is to prevent the withdrawal notices on translated editions
-  # displaying a combination of languages in their titles.
+    # This is to prevent the withdrawal notices on translated editions
+    # displaying a combination of languages in their titles.
     class << @withdrawable
       def schema_name
         "publication"

test/presenters/content_item_presenter_test.rb

@@ -36,14 +36,14 @@ class ContentItemPresenterTest < ActiveSupport::TestCase
   test "available_translations sorts languages by locale with English first" do
     translated = govuk_content_schema_example("case_study", "translated")
     locales = ContentItemPresenter.new(translated).available_translations
-    assert_equal %w(en ar es), (locales.map { |t| t[:locale] })
+    assert_equal %w[en ar es], (locales.map { |t| t[:locale] })
   end
 
   test "available_translations returns native locale names using native_language_name_for" do
     translated = govuk_content_schema_example("case_study", "translated")
     locales = ContentItemPresenter.new(translated).available_translations
 
-    assert_equal %w(English العربية Español), (locales.map { |t| t[:text] })
+    assert_equal %w[English العربية Español], (locales.map { |t| t[:text] })
   end
 
   test "part slug is nil when requesting a content item without parts" do

test/presenters/specialist_document_presenter_test.rb

@@ -246,11 +246,11 @@ def example_facet(overrides = {})
         ],
       }
 
-      values = { "facet-key" => %w{one two} }
+      values = { "facet-key" => %w[one two] }
       example = example_with_finder_facets([example_facet(overrides)], values)
 
       presented = present_example(example)
-      assert_equal %w{One Two}, presented.important_metadata["Facet name"]
+      assert_equal %w[One Two], presented.important_metadata["Facet name"]
     end
 
     test "creates links for filterable friendly values" do

test/presenters/travel_advice_presenter_test.rb

@@ -200,7 +200,7 @@ def schema_name
 
     test "presents alert statuses" do
       example = schema_item("full-country")
-      example["details"]["alert_status"] = %w{avoid_all_but_essential_travel_to_parts avoid_all_travel_to_parts}
+      example["details"]["alert_status"] = %w[avoid_all_but_essential_travel_to_parts avoid_all_travel_to_parts]
       assert present_example(example).alert_status.include?("advise against all but essential travel")
       assert present_example(example).alert_status.include?("advise against all travel to parts")
     end

test/support/govuk_content_schema_examples.rb

@@ -35,7 +35,7 @@ def all_examples_for_supported_schemas
     end
 
     def supported_schemas
-      %w{
+      %w[
         case_study
         coming_soon
         html_publication
@@ -45,7 +45,7 @@ def supported_schemas
         topical_event_about_page
         unpublishing
         working_group
-      }
+      ]
     end
   end
 end

test/test_helper.rb

@@ -160,7 +160,7 @@ def setup_and_visit_random_content_item(document_type: nil)
       .to_return(status: 200, body: content_item.to_json, headers: {})
     visit path
 
-    assert_selector %{meta[name="govuk:content-id"][content="#{content_id}"]}, visible: false
+    assert_selector %(meta[name="govuk:content-id"][content="#{content_id}"]), visible: false
   end
 
   def get_content_example(name)