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

…uk-3.6.0 Bump rubocop-govuk from 3.5.0 to 3.6.0
alphagov · Apr 28, 2020 · 4c8db47 · 4c8db47
2 parents b3ecdfc + 7946add
commit 4c8db47
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -258,7 +258,7 @@ GEM
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-govuk (3.5.0)
+    rubocop-govuk (3.6.0)
       rubocop (= 0.82.0)
       rubocop-rails (~> 2)
       rubocop-rake (~> 0.5.1)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -3,7 +3,6 @@ class ApplicationController < ActionController::Base
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery except: :service_sign_in_options
 
-
   if ENV["BASIC_AUTH_USERNAME"]
     http_basic_authenticate_with(
       name: ENV.fetch("BASIC_AUTH_USERNAME"),

diff --git a/test/components/publisher_metadata_test.rb b/test/components/publisher_metadata_test.rb
@@ -21,7 +21,6 @@ def component_name
     assert_select ".app-c-publisher-metadata__other dd", text: "Ministry of Defence"
   end
 
-
   test "renders two from links when two publishers are given" do
     render_component(other: { from: ["<a href='/government/organisations/ministry-of-defence'>Ministry of Defence</a>", "<a href='/government/organisations/education-funding-agency'>Education Funding Agency</a>"] })
     assert_select ".app-c-publisher-metadata__other a[href='/government/organisations/ministry-of-defence']", text: "Ministry of Defence"

diff --git a/test/controllers/service_sign_in_content_item_controller_test.rb b/test/controllers/service_sign_in_content_item_controller_test.rb
@@ -51,7 +51,6 @@ class ContentItemsControllerTest < ActionController::TestCase
     assert_template :service_sign_in
   end
 
-
   test "raises a 404 for a content item which isn't a service_sign_in page" do
     path = "this/is/not/a/sign/in/page"
     post :service_sign_in_options, params: { path: path }

diff --git a/test/presenters/content_item/organisation_branding_test.rb b/test/presenters/content_item/organisation_branding_test.rb
@@ -44,7 +44,6 @@ def test_organisation
     assert_nil executive_order_crest?(organisation)
   end
 
-
   test "includes an image organisations with a custom logo" do
     organisation = test_organisation
     organisation["details"]["logo"]["image"] = {