From 1ac250094657e4171eaa8492601dd83cb9ecb3d7 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 28 Apr 2020 10:47:18 +0000 Subject: [PATCH 1/2] Bump rubocop-govuk from 3.5.0 to 3.6.0 Bumps [rubocop-govuk](https://github.com/alphagov/rubocop-govuk) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/alphagov/rubocop-govuk/releases) - [Changelog](https://github.com/alphagov/rubocop-govuk/blob/master/CHANGELOG.md) - [Commits](https://github.com/alphagov/rubocop-govuk/compare/v3.5.0...v3.6.0) Signed-off-by: dependabot-preview[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e0e06d0cd..3bc155331 100644 --- 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) From 7946add7af9a403661a8a1a04f11cd94129d398b Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Tue, 28 Apr 2020 14:24:00 +0100 Subject: [PATCH 2/2] Linting auto-correct --- app/controllers/application_controller.rb | 1 - test/components/publisher_metadata_test.rb | 1 - test/controllers/service_sign_in_content_item_controller_test.rb | 1 - test/presenters/content_item/organisation_branding_test.rb | 1 - 4 files changed, 4 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e892e3fdc..e9b831c96 100644 --- 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 index 70e1e29cc..48b18403f 100644 --- 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: ["Ministry of Defence", "Education Funding Agency"] }) 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 index 782f774da..7f8a2ea0e 100644 --- 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 index 5d76f5fbd..f79912232 100644 --- 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"] = {