Run govuk-lint-ruby -a app lib spec

app/controllers/admin/contact_groups_controller.rb

@@ -1,5 +1,5 @@
 class Admin::ContactGroupsController < AdminController
-  before_action :load_contact_group, only: [:edit, :update, :destroy]
+  before_action :load_contact_group, only: %i[edit update destroy]
 
   def new
     @contact_group = ContactGroup.new

app/controllers/admin/contacts/contact_form_links_controller.rb

@@ -1,6 +1,6 @@
 class Admin::Contacts::ContactFormLinksController < AdminController
   before_action :load_parent_contact
-  before_action :load_contact_form_link, only: [:edit, :update, :destroy]
+  before_action :load_contact_form_link, only: %i[edit update destroy]
 
   def new
     @contact_form_link = @contact.contact_form_links.build

app/controllers/admin/contacts/email_addresses_controller.rb

@@ -1,6 +1,6 @@
 class Admin::Contacts::EmailAddressesController < AdminController
   before_action :load_parent_contact
-  before_action :load_email_address, only: [:edit, :update, :destroy]
+  before_action :load_email_address, only: %i[edit update destroy]
 
   def new
     @email_address = @contact.email_addresses.build

app/controllers/admin/contacts/phone_numbers_controller.rb

@@ -1,6 +1,6 @@
 class Admin::Contacts::PhoneNumbersController < AdminController
   before_action :load_parent_contact
-  before_action :load_phone_number, only: [:edit, :update, :destroy]
+  before_action :load_phone_number, only: %i[edit update destroy]
 
   def new
     @phone_number = @contact.phone_numbers.build

app/controllers/admin/contacts/post_addresses_controller.rb

@@ -1,6 +1,6 @@
 class Admin::Contacts::PostAddressesController < AdminController
   before_action :load_parent_contact
-  before_action :load_post_address, only: [:edit, :update, :destroy]
+  before_action :load_post_address, only: %i[edit update destroy]
 
   def new
     @post_address = @contact.post_addresses.build

app/controllers/admin/contacts_controller.rb

@@ -1,5 +1,5 @@
 class Admin::ContactsController < AdminController
-  before_action :load_contact, only: [:edit, :update, :clone, :destroy]
+  before_action :load_contact, only: %i[edit update clone destroy]
   helper_method :search
 
   def new

app/models/concerns/versioning.rb

@@ -1,7 +1,7 @@
 module Versioning
   extend ActiveSupport::Concern
   included do
-    has_paper_trail ignore: [:updated_at, :created_at]
+    has_paper_trail ignore: %i[updated_at created_at]
   end
 
   def display_versions

app/tasks/import_contacts/more_info_record.rb

@@ -17,8 +17,7 @@ def render
     end
 
     class NullMoreInfoUrl
-      def to_markdown
-      end
+      def to_markdown; end
     end
 
     attribute :content, String

lib/tasks/contacts.rake

@@ -34,7 +34,7 @@ namespace :contacts do
   end
 
   desc "Remove a contact and redirect it"
-  task :remove_with_redirect, [:contact_slug, :redirect_to_location] => :environment do |_task, args|
+  task :remove_with_redirect, %i[contact_slug redirect_to_location] => :environment do |_task, args|
     if args.contact_slug.blank? || args.redirect_to_location.blank?
       puts "Usage: rake contacts:remove_with_redirect[contact-to-remove-slug,path-to-redirect-to]"
     else

lib/tasks/update_organisation_slug.rake

@@ -1,5 +1,5 @@
 desc "Update an organisation slug"
-task :update_organisation_slug, [:old_slug, :new_slug] => :environment do |_task, args|
+task :update_organisation_slug, %i[old_slug new_slug] => :environment do |_task, args|
   logger = Logger.new(STDOUT)
   logger.error("You must specify [old_slug,new_slug]") unless args.old_slug.present? && args.new_slug.present?
 

spec/features/admin/contact_edit_spec.rb

@@ -32,8 +32,7 @@
   specify "updating a contact sends the data to the publishing-api" do
     update_contact(contact,
                    title: "new title",
-                   description: "new description"
-                  )
+                   description: "new description")
 
     assert_publishing_api_put_content(contact.content_id, request_json_includes(title: "new title", description: "new description"))
   end

spec/features/admin/contact_form_link_create_spec.rb

@@ -14,8 +14,7 @@
     create_contact_form_link(contact,
                              link: contact_form_link.link,
                              title: contact_form_link.title,
-                             description: contact_form_link.description,
-                            )
+                             description: contact_form_link.description,)
 
     verify contact_form_link_exists(contact, contact_form_link)
   end

spec/features/admin/email_address_create_spec.rb

@@ -13,8 +13,7 @@
   specify "it can be created" do
     create_email_address(contact,
                          title: email_address.title,
-                         email: email_address.email
-                        )
+                         email: email_address.email)
 
     verify email_address_exists(contact, email_address)
   end

spec/features/admin/phone_number_create_spec.rb

@@ -13,8 +13,7 @@
   specify "it can be created" do
     create_phone_number(contact,
                         number: number.number,
-                        title: number.title
-                       )
+                        title: number.title)
 
     verify phone_number_exists(contact, number)
   end

spec/features/admin/post_address_create_spec.rb

@@ -14,8 +14,7 @@
     create_post_address(contact,
                         title: post_address.title,
                         street_address: post_address.street_address,
-                        postal_code: post_address.postal_code
-                       )
+                        postal_code: post_address.postal_code)
 
     verify post_address_exists(contact, post_address)
   end

spec/support/search_api_helpers.rb

@@ -1,12 +1 @@
-RSpec.configure do |config|
-  # rspec-rails 3 will no longer automatically infer an example group's spec type
-  # from the file location. You can explicitly opt-in to the feature using this
-  # config option.
-  # To explicitly tag specs without using automatic inference, set the `:type`
-  # metadata manually:
-  #
-  #     describe ThingsController, :type => :controller do
-  #       # Equivalent to being in spec/controllers
-  #     end
-  config.infer_spec_type_from_file_location!
-end
+RSpec.configure(&:infer_spec_type_from_file_location!)