From bda749989818d69894cb60caf0c5715da0e9df55 Mon Sep 17 00:00:00 2001 From: Ian James Date: Tue, 28 Sep 2021 20:09:39 +0100 Subject: [PATCH] Remove `government_navigation` component The component is no longer needed as the navigation header is being rolled out. --- app/views/layouts/application.html.erb | 4 ---- test/integration/fatality_notice_test.rb | 2 -- test/integration/news_article_test.rb | 1 - test/test_helper.rb | 4 ---- 4 files changed, 11 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 523b84ff9..e9329a2be 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,10 +33,6 @@ <%= yield :extra_head_content %> - <% unless content_for(:simple_header) || explore_menu_variant_b? %> - <%= render 'govuk_publishing_components/components/government_navigation', active: active_proposition %> - <% end %> -
<% if @content_item.show_phase_banner? %> <%= render 'govuk_publishing_components/components/phase_banner', phase: @content_item.phase %> diff --git a/test/integration/fatality_notice_test.rb b/test/integration/fatality_notice_test.rb index cb02068d2..7fbd034f7 100644 --- a/test/integration/fatality_notice_test.rb +++ b/test/integration/fatality_notice_test.rb @@ -4,8 +4,6 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest test "typical fatality notice" do setup_and_visit_content_item("fatality_notice") - 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 73e124180..08c2df646 100644 --- a/test/integration/news_article_test.rb +++ b/test/integration/news_article_test.rb @@ -3,7 +3,6 @@ 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("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") diff --git a/test/test_helper.rb b/test/test_helper.rb index 4ff8a73b6..cfbf7ccf2 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -69,10 +69,6 @@ def assert_has_component_organisation_logo assert page.has_css?(".gem-c-organisation-logo") end - def assert_has_component_government_navigation_active(active) - assert page.has_css?("a", class: "active", text: active) - end - def assert_has_contents_list(contents) assert page.has_css?(".gem-c-contents-list"), "Failed to find an element with a class of contents-list" within ".gem-c-contents-list" do