From 19dbeb1413bd8254830da276a076fc10f9c2f243 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Tue, 26 Feb 2019 12:12:14 +0000 Subject: [PATCH 1/3] Bump govuk_publishing_components from 15.3.0 to 16.1.0 Bumps [govuk_publishing_components](https://github.com/alphagov/govuk_publishing_components) from 15.3.0 to 16.1.0. - [Release notes](https://github.com/alphagov/govuk_publishing_components/releases) - [Changelog](https://github.com/alphagov/govuk_publishing_components/blob/master/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_publishing_components/compare/v15.3.0...v16.1.0) Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index ad631661a..bc757e636 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'gds-api-adapters', '~> 57.2' gem 'govuk_ab_testing', '~> 2.4' gem 'govuk_app_config', '~> 1.11' gem 'govuk_frontend_toolkit', '~> 8.1.0' -gem 'govuk_publishing_components', '~> 15.3.0' +gem 'govuk_publishing_components', '~> 16.1.0' gem 'plek', '~> 2.1' gem 'slimmer', '~> 13.1' diff --git a/Gemfile.lock b/Gemfile.lock index e76e3d762..b2175b9e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,7 +129,7 @@ GEM govuk_frontend_toolkit (8.1.0) railties (>= 3.1.0) sass (>= 3.2.0) - govuk_publishing_components (15.3.0) + govuk_publishing_components (16.1.0) govspeak (>= 5.0.3) govuk_app_config govuk_frontend_toolkit @@ -196,7 +196,7 @@ GEM nokogumbo (1.5.0) nokogiri null_logger (0.0.1) - oj (3.7.8) + oj (3.7.9) parallel (1.13.0) parser (2.6.0.0) ast (~> 2.4.0) @@ -370,7 +370,7 @@ DEPENDENCIES govuk_ab_testing (~> 2.4) govuk_app_config (~> 1.11) govuk_frontend_toolkit (~> 8.1.0) - govuk_publishing_components (~> 15.3.0) + govuk_publishing_components (~> 16.1.0) govuk_schemas (~> 3.2) htmlentities (~> 4.3) jasmine-rails From 57f56073dea553deeefad4d4539d8e540bdcea37 Mon Sep 17 00:00:00 2001 From: Kevin Dew Date: Wed, 27 Feb 2019 13:19:57 +0000 Subject: [PATCH 2/3] Change announcements navigation assertions "Announcements" has been replaced in the government navigation header with "News and communications" since 16.0.0 of govuk_publishing_components. --- test/integration/fatality_notice_test.rb | 2 +- test/integration/news_article_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/fatality_notice_test.rb b/test/integration/fatality_notice_test.rb index 25d655ecd..cc7a30150 100644 --- a/test/integration/fatality_notice_test.rb +++ b/test/integration/fatality_notice_test.rb @@ -4,7 +4,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest test "typical fatality notice" do setup_and_visit_content_item('fatality_notice') - assert_has_component_government_navigation_active("Announcements") + assert_has_component_government_navigation_active("News and communications") assert page.has_title?( "Sir George Pomeroy Colley killed in Boer War - Fatality notice - GOV.UK" diff --git a/test/integration/news_article_test.rb b/test/integration/news_article_test.rb index 59cf4de7b..896778fbe 100644 --- a/test/integration/news_article_test.rb +++ b/test/integration/news_article_test.rb @@ -3,7 +3,7 @@ class NewsArticleTest < ActionDispatch::IntegrationTest test "news article renders title, description and body" do setup_and_visit_content_item("news_article") - assert_has_component_government_navigation_active("Announcements") + assert_has_component_government_navigation_active("News and communications") assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) assert page.has_text?("This year, the United Kingdom has had much to celebrate. Her Majesty The Queen celebrated her 90th birthday") From 4a90f0f2e2f217bc5ff581f6f026f0e323ee9d2c Mon Sep 17 00:00:00 2001 From: Kevin Dew Date: Wed, 27 Feb 2019 13:45:48 +0000 Subject: [PATCH 3/3] Fix govspeak deprecation warning --- app/views/content_items/contact.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/content_items/contact.html.erb b/app/views/content_items/contact.html.erb index 796c75b33..46dd11107 100644 --- a/app/views/content_items/contact.html.erb +++ b/app/views/content_items/contact.html.erb @@ -99,7 +99,9 @@ <% end %> <% end %> - <%= render 'govuk_publishing_components/components/govspeak', content: body %> + <%= render 'govuk_publishing_components/components/govspeak' do %> + <%= body %> + <% end %> <%= render 'shared/sidebar_navigation' %>