Merge pull request #1260 from alphagov/dependabot/bundler/govuk_publi…

…shing_components-16.1.0 Bump govuk_publishing_components from 15.3.0 to 16.1.0
alphagov · Feb 27, 2019 · 1402f12 · 1402f12
2 parents 5854089 + 4a90f0f
commit 1402f12
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ gem 'gds-api-adapters', '~> 57.4'
 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
@@ -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

diff --git 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 %>
   </div>
   <%= render 'shared/sidebar_navigation' %>
 </div>

diff --git 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
@@ -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")