<%= render_phase_label @content_item, content_for(:phase_message) %>
- <% if step_nav_helper.show_header? %>
- <%= render 'shared/step_nav_header' %>
- <% else %>
- <% if !content_for(:no_breadcrumbs) %>
- <%= render 'shared/breadcrumbs' %>
- <% end %>
- <% end %>
+ <%= render 'govuk_publishing_components/components/contextual_breadcrumbs', content_item: @content_item.content_item.parsed_content %>
diff --git a/app/views/shared/_breadcrumbs.html.erb b/app/views/shared/_breadcrumbs.html.erb
deleted file mode 100644
index e455f4dff..000000000
--- a/app/views/shared/_breadcrumbs.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<% if @navigation.should_present_taxonomy_navigation? %>
- <% if @content_item.taxon_breadcrumbs.any? %>
- <%= render 'govuk_component/breadcrumbs',
- breadcrumbs: @content_item.taxon_breadcrumbs,
- collapse_on_mobile: true %>
- <% end %>
-<% else %>
- <% if @content_item.breadcrumbs.any? %>
- <%= render 'govuk_component/breadcrumbs', breadcrumbs: @content_item.breadcrumbs %>
- <% end %>
-<% end %>
diff --git a/app/views/shared/_related_items.html.erb b/app/views/shared/_related_items.html.erb
deleted file mode 100644
index 014934a96..000000000
--- a/app/views/shared/_related_items.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-
- <% if @navigation.should_present_taxonomy_navigation? %>
- <%=
- render(
- partial: 'govuk_component/taxonomy_sidebar',
- locals: content_item.taxonomy_sidebar
- ) %>
- <% else %>
- <%=
- render(
- partial: 'govuk_component/related_items',
- locals: content_item.related_items
- ) %>
- <% end %>
-
diff --git a/app/views/shared/_sidebar_navigation.html.erb b/app/views/shared/_sidebar_navigation.html.erb
index d30ddc31e..887450c4e 100644
--- a/app/views/shared/_sidebar_navigation.html.erb
+++ b/app/views/shared/_sidebar_navigation.html.erb
@@ -1,14 +1,3 @@
-<% if step_nav_helper.show_related_links? %>
-
- <%= render 'shared/sidebar_step_nav', no_margin: true %>
-<% else %>
-
- <% if @navigation.should_present_taxonomy_navigation? %>
-
- <%= render partial: 'govuk_component/taxonomy_sidebar', locals: @content_item.taxonomy_sidebar %>
- <% else %>
-
- <%= render 'govuk_publishing_components/components/related_navigation', @content_item.content_item.parsed_content %>
- <% end %>
-
+ <%= render 'govuk_publishing_components/components/contextual_sidebar', content_item: @content_item.content_item.parsed_content %>
+
diff --git a/app/views/shared/_sidebar_step_nav.html.erb b/app/views/shared/_sidebar_step_nav.html.erb
deleted file mode 100644
index d94788be1..000000000
--- a/app/views/shared/_sidebar_step_nav.html.erb
+++ /dev/null
@@ -1,9 +0,0 @@
-<%
- no_margin ||= false
-%>
-
diff --git a/app/views/shared/_step_nav_header.html.erb b/app/views/shared/_step_nav_header.html.erb
deleted file mode 100644
index a4dfa1ac0..000000000
--- a/app/views/shared/_step_nav_header.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-<% if step_nav_helper.show_header? %>
- <%= render 'govuk_publishing_components/components/step_by_step_nav_header', step_nav_helper.header %>
-<% end %>
diff --git a/app/views/shared/_title_and_translations.html.erb b/app/views/shared/_title_and_translations.html.erb
index 9af0b1f99..55fa7c969 100644
--- a/app/views/shared/_title_and_translations.html.erb
+++ b/app/views/shared/_title_and_translations.html.erb
@@ -1,11 +1,6 @@
-<% if @navigation.should_present_taxonomy_navigation? %>
- <%= render 'govuk_component/title', @content_item.title_and_context %>
- <%= render 'shared/translations', translations: @content_item.available_translations %>
-<% else %>
-
-
- <%= render 'govuk_component/title', @content_item.title_and_context %>
-
- <%= render 'shared/translations' %>
+
+
+ <%= render 'govuk_component/title', @content_item.title_and_context %>
-<% end %>
+ <%= render 'shared/translations' %>
+
diff --git a/app/views/shared/_translations.html.erb b/app/views/shared/_translations.html.erb
index 3ed9e57c0..84612dba9 100644
--- a/app/views/shared/_translations.html.erb
+++ b/app/views/shared/_translations.html.erb
@@ -1,11 +1,6 @@
<% if @content_item.available_translations.length > 1 %>
- <% if @navigation.should_present_taxonomy_navigation? %>
+
<%= render 'components/translation-nav',
translations: @content_item.available_translations %>
- <% else %>
-
- <%= render 'components/translation-nav',
- translations: @content_item.available_translations %>
-
- <% end %>
+
<% end %>
diff --git a/config/initializers/govuk_navigation_helpers.rb b/config/initializers/govuk_navigation_helpers.rb
deleted file mode 100644
index 32ad2b2bd..000000000
--- a/config/initializers/govuk_navigation_helpers.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-GovukNavigationHelpers.configure do |config|
- config.error_handler = GovukError
- config.statsd = GovukStatsd
-end
diff --git a/test/controllers/content_items_controller_test.rb b/test/controllers/content_items_controller_test.rb
index 960e52159..efc3dd7c7 100644
--- a/test/controllers/content_items_controller_test.rb
+++ b/test/controllers/content_items_controller_test.rb
@@ -252,64 +252,6 @@ class ContentItemsControllerTest < ActionController::TestCase
assert_redirected_to 'https://www.test.gov.uk/new-406-beacons-destination/to-preserve'
end
- test "does not show taxonomy-navigation when no taxons are tagged to Detailed Guides" do
- content_item = content_store_has_schema_example('document_collection', 'document_collection')
- path = 'government/test/detailed-guide'
- content_item['base_path'] = "/#{path}"
- content_item['links'] = {}
-
- content_store_has_item(content_item['base_path'], content_item)
-
- get :show, params: { path: path_for(content_item) }
- assert_equal [], @request.variant
- refute_match(/A Taxon/, taxonomy_sidebar)
- end
-
- test "does not show taxonomy-navigation when page is tagged to mainstream browse" do
- content_item = content_store_has_schema_example('document_collection', 'document_collection')
- path = 'government/test/document_collection'
- content_item['base_path'] = "/#{path}"
- content_item['links'] = {
- 'mainstream_browse_pages' => [
- {
- 'content_id' => 'something'
- }
- ],
- 'taxons' => [
- {
- 'title' => 'A Taxon',
- 'base_path' => '/a-taxon',
- }
- ]
- }
-
- content_store_has_item(content_item['base_path'], content_item)
-
- get :show, params: { path: path_for(content_item) }
- assert_equal [], @request.variant
- refute_match(/A Taxon/, taxonomy_sidebar)
- end
-
- test "Case Studies don't have the taxonomy-navigation" do
- content_item = content_store_has_schema_example('case_study', 'case_study')
- path = 'government/test/case-study'
- content_item['base_path'] = "/#{path}"
- content_item['links'] = {
- 'taxons' => [
- {
- 'title' => 'A Taxon',
- 'base_path' => '/a-taxon',
- }
- ]
- }
-
- content_store_has_item(content_item['base_path'], content_item)
-
- get :show, params: { path: path_for(content_item) }
- assert_equal [], @request.variant
- refute_match(/A Taxon/, taxonomy_sidebar)
- end
-
test "sets the Access-Control-Allow-Origin header for atom pages" do
content_store_has_schema_example('travel_advice', 'full-country')
get :show, params: { path: 'foreign-travel-advice/albania', format: 'atom' }
@@ -322,16 +264,4 @@ def path_for(content_item, locale = nil)
base_path.gsub!(/\.#{locale}$/, '') if locale
base_path
end
-
- def related_links_sidebar
- Nokogiri::HTML.parse(response.body).at_css(
- shared_component_selector("related_items")
- )
- end
-
- def taxonomy_sidebar
- Nokogiri::HTML.parse(response.body).at_css(
- shared_component_selector("taxonomy_sidebar")
- )
- end
end
diff --git a/test/controllers/guide_chapter_nav_ab_test_controller_test.rb b/test/controllers/guide_chapter_nav_ab_test_controller_test.rb
index c3b6acb87..962c3219c 100644
--- a/test/controllers/guide_chapter_nav_ab_test_controller_test.rb
+++ b/test/controllers/guide_chapter_nav_ab_test_controller_test.rb
@@ -5,18 +5,6 @@ class ContentItemsControllerTest < ActionController::TestCase
include GovukAbTesting::MinitestHelpers
%w(A B).each do |test_variant|
- test "GuideChapterNav variant #{test_variant} does not affect guides in the education taxonomy" do
- # this sample guide is part of the education taxon
- content_item = content_store_has_schema_example("guide", "guide")
- content_store_has_item(content_item['base_path'], content_item)
-
- setup_ab_variant("GuideChapterNav", test_variant)
-
- get :show, params: { path: path_for(content_item) }
- assert_response 200
- assert_response_not_modified_for_ab_test("GuideChapterNav")
- end
-
test "GuideChapterNav variant #{test_variant} works for guides not in the education taxon" do
#this sample guide is not part of the education taxon
content_item = content_store_has_schema_example("guide", "single-page-guide")
diff --git a/test/integration/case_study_test.rb b/test/integration/case_study_test.rb
index eaad96c6e..b44f37494 100644
--- a/test/integration/case_study_test.rb
+++ b/test/integration/case_study_test.rb
@@ -26,14 +26,4 @@ class CaseStudyTest < ActionDispatch::IntegrationTest
assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']")
end
end
-
- test "world location link" do
- setup_and_visit_content_item('translated')
-
- assert_has_related_navigation(
- section_name: "related-nav-world_locations",
- section_text: "World locations",
- links: { "Spain": "/world/spain/news" }
- )
- end
end
diff --git a/test/integration/consultation_test.rb b/test/integration/consultation_test.rb
index c74b4a715..590301ce7 100644
--- a/test/integration/consultation_test.rb
+++ b/test/integration/consultation_test.rb
@@ -16,13 +16,6 @@ class ConsultationTest < ActionDispatch::IntegrationTest
)
assert_footer_has_published_dates("Published 4 November 2016", "Last updated 7 November 2016")
- assert_has_related_navigation([
- {
- section_name: "related-nav-topics",
- section_text: "Explore the topic",
- links: { "Higher education administration": "/topic/higher-education/administration" }
- }
- ])
within '.consultation-description' do
assert_has_component_govspeak(@content_item["details"]["body"])
diff --git a/test/integration/contact_test.rb b/test/integration/contact_test.rb
index 665ff3879..9ae2ff94c 100644
--- a/test/integration/contact_test.rb
+++ b/test/integration/contact_test.rb
@@ -66,17 +66,4 @@ class ContactTest < ActionDispatch::IntegrationTest
assert_not_nil html.at_css(".street-address")
end
end
-
- test "related links are rendered" do
- setup_and_visit_content_item('contact')
- within shared_component_selector("related_items") do
- quick_links = @content_item["details"]["quick_links"]
- assert_equal quick_links, JSON.parse(page.text).fetch("sections").first["items"]
-
- first_related_contacts_links = @content_item["links"]["related"].first
- first_parsed_related_contacts_links = JSON.parse(page.text).fetch("sections").last["items"].first
- assert_equal first_related_contacts_links["title"], first_parsed_related_contacts_links["title"]
- assert_equal first_related_contacts_links["base_path"], first_parsed_related_contacts_links["url"]
- end
- end
end
diff --git a/test/integration/detailed_guide_test.rb b/test/integration/detailed_guide_test.rb
index 2fc012fd6..7bd21a3fe 100644
--- a/test/integration/detailed_guide_test.rb
+++ b/test/integration/detailed_guide_test.rb
@@ -41,50 +41,6 @@ class DetailedGuideTest < ActionDispatch::IntegrationTest
end
end
- test "renders related topics" do
- setup_and_visit_content_item('detailed_guide')
-
- assert_has_related_navigation([
- {
- section_name: "related-nav-topics",
- section_text: "Explore the topic",
- links: {
- "PAYE": "/topic/business-tax/paye",
- "Business tax": "/topic/business-tax",
- }
- }
- ])
- end
-
- test "shows related detailed guides" do
- setup_and_visit_content_item('political_detailed_guide')
-
- assert_has_related_navigation([
- {
- section_name: "related-nav-related_guides",
- section_text: "Detailed guidance",
- links: {
- "Offshore wind: part of the UK's energy mix":
- "/guidance/offshore-wind-part-of-the-uks-energy-mix"
- }
- }
- ])
- end
-
- test "shows related mainstream links" do
- setup_and_visit_content_item('related_mainstream_detailed_guide')
-
- assert_has_related_navigation([
- {
- section_name: "related-nav-related_items",
- links: {
- "Overseas British passport applications": "/overseas-passports",
- "Cancel a lost or stolen passport": "/report-a-lost-or-stolen-passport",
- }
- }
- ])
- end
-
test "historically political detailed guide" do
setup_and_visit_content_item('political_detailed_guide')
diff --git a/test/integration/document_collection_test.rb b/test/integration/document_collection_test.rb
index bbfb1fbbc..67851f4fd 100644
--- a/test/integration/document_collection_test.rb
+++ b/test/integration/document_collection_test.rb
@@ -32,19 +32,6 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest
assert_footer_has_published_dates("Published 29 February 2016")
end
- test "renders related navigation sidebar" do
- setup_and_visit_content_item('document_collection')
- assert_has_related_navigation(
- [
- {
- section_name: "related-nav-topics",
- section_text: "Explore the topic",
- links: { "PAYE": "/topic/business-tax/paye" }
- }
- ]
- )
- end
-
test "renders body when provided" do
setup_and_visit_content_item('document_collection_with_body')
assert_has_component_govspeak(@content_item["details"]["body"])
diff --git a/test/integration/help_page_test.rb b/test/integration/help_page_test.rb
index 8d8f9a2ae..779af7b38 100644
--- a/test/integration/help_page_test.rb
+++ b/test/integration/help_page_test.rb
@@ -8,14 +8,4 @@ class HelpPageTest < ActionDispatch::IntegrationTest
# assert page.has_text?("Last updated: 16 December 2014")
assert_has_component_govspeak(@content_item["details"]["body"].squish)
end
-
- test "related links are rendered" do
- setup_and_visit_content_item('help_page')
-
- related_links = @content_item["links"]["ordered_related_items"].first
-
- within(".gem-c-related-navigation") do
- assert page.has_css?('.gem-c-related-navigation__section-link--other[href="' + related_links["base_path"] + '"]', text: related_links["title"])
- end
- end
end
diff --git a/test/integration/news_article_test.rb b/test/integration/news_article_test.rb
index 7831b4d4d..bf1034754 100644
--- a/test/integration/news_article_test.rb
+++ b/test/integration/news_article_test.rb
@@ -25,17 +25,6 @@ class NewsArticleTest < ActionDispatch::IntegrationTest
assert_footer_has_published_dates("Published 25 December 2016")
end
-
- test "renders policy links" do
- setup_and_visit_content_item('news_article_government_response')
-
- assert_has_related_navigation(
- section_name: "related-nav-policies",
- section_text: "Policy",
- links: { "Marine environment": "/government/policies/marine-environment" }
- )
- end
-
test "renders translation links when there is more than one translation" do
setup_and_visit_content_item("news_article")
diff --git a/test/integration/publication_test.rb b/test/integration/publication_test.rb
index 71777859d..7abdc4d9b 100644
--- a/test/integration/publication_test.rb
+++ b/test/integration/publication_test.rb
@@ -76,18 +76,4 @@ class PublicationTest < ActionDispatch::IntegrationTest
}
)
end
-
- test "doesn't render government navigation for pages with taxonomy navigation" do
- NavigationType.any_instance.stubs(:should_present_taxonomy_navigation?).returns(true)
- setup_and_visit_content_item('publication')
-
- refute page.has_css?(shared_component_selector('government_navigation'))
- end
-
- test "renders government navigation for pages without taxonomy navigation" do
- NavigationType.any_instance.stubs(:should_present_taxonomy_navigation?).returns(false)
- setup_and_visit_content_item('publication')
-
- assert page.has_css?(shared_component_selector('government_navigation'))
- end
end
diff --git a/test/integration/service_sign_in/choose_sign_in_test.rb b/test/integration/service_sign_in/choose_sign_in_test.rb
index 4d0337a3c..c6a41385a 100644
--- a/test/integration/service_sign_in/choose_sign_in_test.rb
+++ b/test/integration/service_sign_in/choose_sign_in_test.rb
@@ -17,7 +17,6 @@ class ChooseSignInTest < ActionDispatch::IntegrationTest
assert page.has_css?("title", text: 'Prove your identity to continue - GOV.UK', visible: false)
assert page.has_css?('meta[name="robots"][content="noindex, nofollow"]', visible: false)
- refute page.has_css?(shared_component_selector('breadcrumbs'))
refute page.has_css?(shared_component_selector('government_navigation'))
assert page.has_css?('.gem-c-back-link[href="/log-in-file-self-assessment-tax-return"]', text: 'Back')
diff --git a/test/integration/service_sign_in/create_new_account_test.rb b/test/integration/service_sign_in/create_new_account_test.rb
index d9743ac0b..67b12fc77 100644
--- a/test/integration/service_sign_in/create_new_account_test.rb
+++ b/test/integration/service_sign_in/create_new_account_test.rb
@@ -28,7 +28,6 @@ class CreateNewAccount < ActionDispatch::IntegrationTest
assert_has_component_govspeak("
To use this service, you need to create either a Government Gateway or GOV.UK Verify account. These are used to help fight identity theft.
Once you have an account, you can use it to access other government services online.
Choose a way to prove your identity
Government Gateway
Registering with Government Gateway usually takes about 10 minutes. It works best if you have:
- your National Insurance number
- a recent payslip or P60 or a valid UK passport
Create a Government Gateway account.
GOV.UK Verify
Registering with GOV.UK Verify usually takes about 15 minutes. It works best if you have:
- a UK address
- a valid passport or photocard driving licence
Create a GOV.UK Verify account.
A certified company will double check your identity when you register with GOV.UK Verify. They’ve all met security standards set by government.
Personal tax account
Signing in for the first time will activate your personal tax account. You can use this to check your HMRC records and manage your other details.
")
assert page.has_css?('meta[name="robots"][content="noindex, nofollow"]', visible: false)
- refute page.has_css?(shared_component_selector('breadcrumbs'))
refute page.has_css?(shared_component_selector('government_navigation'))
assert page.has_css?(
diff --git a/test/integration/service_sign_in/verify_hub_trial_create_new_account_test.rb b/test/integration/service_sign_in/verify_hub_trial_create_new_account_test.rb
index ede227219..d15d01bf5 100644
--- a/test/integration/service_sign_in/verify_hub_trial_create_new_account_test.rb
+++ b/test/integration/service_sign_in/verify_hub_trial_create_new_account_test.rb
@@ -51,7 +51,6 @@ class VerifyHubTrialCreateNewAccount < ActionDispatch::IntegrationTest
assert_has_component_govspeak("
To use this service, you need to create either a Government Gateway or GOV.UK Verify account. These are used to help fight identity theft.
Once you have an account, you can use it to access other government services online.
Choose a way to prove your identity
Government Gateway
Registering with Government Gateway usually takes about 10 minutes. It works best if you have:
- your National Insurance number
- a recent payslip or P60 or a valid UK passport
Create a Government Gateway account.
GOV.UK Verify
Registering with GOV.UK Verify usually takes about 15 minutes. It works best if you have:
- a UK address
- a valid passport or photocard driving licence
Create a GOV.UK Verify account.
A certified company will double check your identity when you register with GOV.UK Verify. They’ve all met security standards set by government.
Personal tax account
Signing in for the first time will activate your personal tax account. You can use this to check your HMRC records and manage your other details.
")
assert page.has_css?('meta[name="robots"][content="noindex, nofollow"]', visible: false)
- refute page.has_css?(shared_component_selector('breadcrumbs'))
refute page.has_css?(shared_component_selector('government_navigation'))
assert page.has_css?(
diff --git a/test/integration/speech_test.rb b/test/integration/speech_test.rb
index ae1a223eb..941a7546c 100644
--- a/test/integration/speech_test.rb
+++ b/test/integration/speech_test.rb
@@ -40,19 +40,4 @@ class SpeechTest < ActionDispatch::IntegrationTest
assert_footer_has_published_dates("Published 8 March 2016")
end
-
- test "renders related policy links" do
- setup_and_visit_content_item('speech-transcript')
-
- assert_has_related_navigation(
- section_name: "related-nav-policies",
- section_text: "Policy",
- links: {
- "Government transparency and accountability":
- "/government/policies/government-transparency-and-accountability",
- "Tax evasion and avoidance":
- "/government/policies/tax-evasion-and-avoidance"
- }
- )
- end
end
diff --git a/test/integration/statistical_data_set_test.rb b/test/integration/statistical_data_set_test.rb
index 3f3155e09..a0118aca6 100644
--- a/test/integration/statistical_data_set_test.rb
+++ b/test/integration/statistical_data_set_test.rb
@@ -20,22 +20,6 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest
assert_footer_has_published_dates("Published 13 December 2012")
end
- test "render related side bar navigation" do
- setup_and_visit_content_item('statistical_data_set')
- assert_has_related_navigation(
- [
- {
- section_name: "related-nav-collections",
- section_text: "Collection",
- links: {
- "Transport Statistics Great Britain":
- "/government/collections/transport-statistics-great-britain"
- }
- },
- ]
- )
- end
-
test "renders withdrawn notification" do
setup_and_visit_content_item("statistical_data_set_withdrawn")
diff --git a/test/integration/topical_event_about_page_test.rb b/test/integration/topical_event_about_page_test.rb
index 17d3f1ef3..bf188cc70 100644
--- a/test/integration/topical_event_about_page_test.rb
+++ b/test/integration/topical_event_about_page_test.rb
@@ -17,33 +17,6 @@ class TopicalEventAboutPageTest < ActionDispatch::IntegrationTest
])
end
- test "breadcrumbs show whether a topical event is archived" do
- @content_item = get_content_example("topical_event_about_page")
- content_store_has_item(@content_item["base_path"], @content_item.to_json)
-
- breadcrumbs = [
- {
- title: "Home",
- url: "/"
- },
- {
- title: @content_item["links"]["parent"][0]["title"],
- url: @content_item["links"]["parent"][0]["base_path"]
- },
- ]
-
- travel_to(topical_event_end_date - 1) do
- visit @content_item["base_path"]
- assert_has_component_breadcrumbs(breadcrumbs)
- end
-
- travel_to(topical_event_end_date) do
- visit @content_item["base_path"]
- breadcrumbs[1][:title] = @content_item["links"]["parent"][0]["title"] + " (Archived)"
- assert_has_component_breadcrumbs(breadcrumbs)
- end
- end
-
test "slim topical event about pages have no contents" do
setup_and_visit_content_item('slim')
refute page.has_css?('.contents-list.contents-list-dashed')
diff --git a/test/integration/world_location_news_article_test.rb b/test/integration/world_location_news_article_test.rb
index ff3b1279d..515004b23 100644
--- a/test/integration/world_location_news_article_test.rb
+++ b/test/integration/world_location_news_article_test.rb
@@ -21,23 +21,6 @@ class WorldLocationNewsArticleTest < ActionDispatch::IntegrationTest
assert_footer_has_published_dates("Published 24 November 2015")
end
- test "renders organisation and location links" do
- setup_and_visit_content_item('world_location_news_article')
-
- assert_has_publisher_metadata(metadata: {
- "From": {
- "British High Commission Nairobi":
- "/government/world/organisations/british-high-commission-nairobi"
- }
- })
-
- assert_has_related_navigation(
- section_name: "related-nav-world_locations",
- section_text: "World locations",
- links: { "Kenya": "/world/kenya/news" }
- )
- end
-
test "renders translation links when there is more than one translation" do
setup_and_visit_content_item("world_location_news_article_with_multiple_translations")
diff --git a/test/presenters/contact_presenter_test.rb b/test/presenters/contact_presenter_test.rb
index 04b4dfaa7..0ab622830 100644
--- a/test/presenters/contact_presenter_test.rb
+++ b/test/presenters/contact_presenter_test.rb
@@ -10,31 +10,6 @@ def schema_name
assert_equal schema_item['title'], presented_item.title
end
- test 'only presents related item sections when section has items' do
- schema = schema_item('contact_with_email_and_no_other_contacts')
- presented = presented_item('contact_with_email_and_no_other_contacts')
-
- refute schema['links']['related']
- other_contacts_section = presented.related_items[:sections].select { |section| section[:title] == 'Other contacts' }
- assert_empty other_contacts_section
- end
-
- test 'presents quick links in related items' do
- first_quick_link = schema_item['details']['quick_links'].first
- first_presented_quick_link = presented_item.related_items[:sections].first[:items].first
-
- assert_equal first_quick_link['title'], first_presented_quick_link[:title]
- assert_equal 'Elsewhere on GOV.UK', presented_item.related_items[:sections].first[:title]
- end
-
- test 'presents related contacts links in related items' do
- first_related_contact_link = schema_item['links']['related'].first
- first_presented_contact_link = presented_item.related_items[:sections].last[:items].first
-
- assert_equal first_related_contact_link['title'], first_presented_contact_link[:title]
- assert_equal 'Other contacts', presented_item.related_items[:sections].last[:title]
- end
-
test 'presents online form links' do
assert_equal schema_item['details']['contact_form_links'].first['link'], presented_item.online_form_links.first[:url]
end
@@ -109,47 +84,6 @@ def schema_name
assert_nil present_example(example).online_form_body
end
- test 'breadcrumbs' do
- assert_equal [
- {
- title: "Home",
- url: "/"
- },
- {
- title: "HM Revenue & Customs",
- url: "/government/organisations/hm-revenue-customs"
- },
- {
- title: "Contact HM Revenue & Customs",
- url: "/government/organisations/hm-revenue-customs/contact"
- }
- ], presented_item.breadcrumbs
- end
-
- test 'no breadcrumbs render with no organisations' do
- schema = schema_item('contact')
- schema["links"]["organisations"] = []
-
- assert_equal [], present_example(schema).breadcrumbs
- end
-
- test 'no breadcrumbs render with no organisations set' do
- schema = schema_item('contact')
- schema["links"].delete("organisations")
- assert_equal [], present_example(schema).breadcrumbs
- end
-
- test 'no breadcrumbs render with two organisations' do
- schema = schema_item('contact')
- two_orgs = [
- schema["links"]["organisations"],
- schema["links"]["organisations"]
- ].flatten
-
- schema["links"]["organisations"] = two_orgs
- assert_equal [], present_example(schema).breadcrumbs
- end
-
test 'presents webchat' do
schema = schema_item('contact_with_webchat')
presented = present_example(schema)
diff --git a/test/presenters/content_item_presenter_test.rb b/test/presenters/content_item_presenter_test.rb
index 8131d9d31..68835adfb 100644
--- a/test/presenters/content_item_presenter_test.rb
+++ b/test/presenters/content_item_presenter_test.rb
@@ -21,15 +21,6 @@ class ContentItemPresenterTest < ActiveSupport::TestCase
assert_equal "Type", ContentItemPresenter.new("document_type" => "Type").document_type
end
- test "#taxonomy_sidebar combines taxonomy links and collections links for the taxonomy sidebar component" do
- GovukNavigationHelpers::NavigationHelper.any_instance
- .stubs(:taxonomy_sidebar)
- .returns(items: :some_taxonomy_data, collections: :some_collections_data)
-
- expected = { items: :some_taxonomy_data, collections: :some_collections_data }
- assert_equal expected, ContentItemPresenter.new("schema_name" => "Schema name").taxonomy_sidebar
- end
-
test "available_translations sorts languages by locale with English first" do
translated = govuk_content_schema_example('case_study', 'translated')
locales = ContentItemPresenter.new(translated).available_translations
diff --git a/test/presenters/detailed_guide_presenter_test.rb b/test/presenters/detailed_guide_presenter_test.rb
index b324054df..efee9f394 100644
--- a/test/presenters/detailed_guide_presenter_test.rb
+++ b/test/presenters/detailed_guide_presenter_test.rb
@@ -21,19 +21,6 @@ def schema_name
assert_equal '12 June 2014', presented_item.published
end
- test 'breadcrumbs show the full parent hierarchy' do
- assert_equal "Home", presented_item.breadcrumbs[0][:title]
- assert_equal "/", presented_item.breadcrumbs[0][:url]
- assert_equal "Business tax", presented_item.breadcrumbs[1][:title]
- assert_equal "/topic/business-tax", presented_item.breadcrumbs[1][:url]
- assert_equal "PAYE", presented_item.breadcrumbs[2][:title]
- assert_equal "/topic/business-tax/paye", presented_item.breadcrumbs[2][:url]
- end
-
- test 'the "home" link shows if there is no parent' do
- assert_equal [{ title: "Home", url: "/" }], presented_item("withdrawn_detailed_guide").breadcrumbs
- end
-
test 'presents withdrawn notices' do
example = schema_item("withdrawn_detailed_guide")
presented = presented_item("withdrawn_detailed_guide")
diff --git a/test/presenters/specialist_document_presenter_test.rb b/test/presenters/specialist_document_presenter_test.rb
index f8e25a5f2..d2f3be42d 100644
--- a/test/presenters/specialist_document_presenter_test.rb
+++ b/test/presenters/specialist_document_presenter_test.rb
@@ -310,19 +310,6 @@ def example_facet(overrides = {})
assert_equal expected_order, present_example(example).important_metadata.keys
end
- test 'breadcrumbs' do
- assert_equal [
- {
- title: "Home",
- url: "/"
- },
- {
- title: "Finder title",
- url: "/finder-base-path"
- }
- ], present_example(example_with_finder_facets).breadcrumbs
- end
-
test 'sends an error notification when there is no finder' do
example = schema_item('aaib-reports')
example['links']['finder'] = []
@@ -335,15 +322,6 @@ def example_facet(overrides = {})
present_example(example).important_metadata
end
- test 'no breadcrumbs render with no finder' do
- example = schema_item('aaib-reports')
- example['links']['finder'] = []
- assert_equal [], present_example(example).breadcrumbs
-
- example['links'].delete('finder')
- assert_equal [], present_example(example).breadcrumbs
- end
-
test 'omits first_published_at facet values from `other` section of component parameters to avoid duplicates' do
facets = [
{
diff --git a/test/presenters/topical_event_about_page_presenter_test.rb b/test/presenters/topical_event_about_page_presenter_test.rb
index 3cc22dc61..575d79ae9 100644
--- a/test/presenters/topical_event_about_page_presenter_test.rb
+++ b/test/presenters/topical_event_about_page_presenter_test.rb
@@ -26,36 +26,4 @@ def schema_name
test 'presents no contents when no headings in the body' do
assert_equal [], presented_item('slim').contents
end
-
- test 'presents a breadcrumb and indicates the archive state of the parent topical event' do
- breadcrumbs = [
- { title: "Home", url: "/" },
- { title: "Ebola virus: UK government response", url: "/government/topical-events/ebola-virus-government-response" }
- ]
-
- travel_to(topical_event_end_date - 1) do
- assert_equal breadcrumbs, presented_item.breadcrumbs
- end
-
- travel_to(topical_event_end_date) do
- breadcrumbs[1][:title] = "Ebola virus: UK government response (Archived)"
- assert_equal breadcrumbs, presented_item.breadcrumbs
- end
- end
-
- test 'presents a breadcrumb if parent topic event has no end date' do
- breadcrumbs = [
- { title: "Home", url: "/" },
- { title: "Battle of the Somme Centenary", url: "/government/topical-events/battle-of-the-somme-centenary-commemorations" }
- ]
-
- refute schema_item('slim')['links']['parent'][0]['details']['end_date']
- assert_equal breadcrumbs, presented_item('slim').breadcrumbs
- end
-
-private
-
- def topical_event_end_date
- Date.parse(schema_item['links']['parent'][0]['details']['end_date'])
- end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 4a6724e9f..47287a57a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -96,12 +96,6 @@ def within_component_govspeak
end
end
- def assert_has_component_breadcrumbs(breadcrumbs)
- within shared_component_selector("breadcrumbs") do
- assert_equal breadcrumbs, JSON.parse(page.text).deep_symbolize_keys.fetch(:breadcrumbs)
- end
- end
-
def assert_has_component_organisation_logo(logo, index = 1)
within(shared_component_selector("organisation_logo") + ":nth-of-type(#{index})") do
assert_equal logo, JSON.parse(page.text).deep_symbolize_keys
@@ -182,33 +176,6 @@ def assert_footer_has_published_dates(published = nil, last_updated = nil, histo
assert_has_published_dates(published, last_updated, history_link, 1)
end
- def assert_has_related_navigation_section_and_links(section_name, section_text, links)
- unless section_name == "related-nav-related_items"
- find("h3[id^='#{section_name}']", text: section_text)
- end
-
- within("nav[aria-labelledby^='#{section_name}']") do
- links.each do |text, href|
- assert page.has_link?(text, href: href),
- "Related navigation link '#{text}' not found in '#{section_text}' links"
- end
- end
- end
-
- def assert_has_related_navigation(sections)
- within(".gem-c-related-navigation") do
- assert page.has_css?(".gem-c-related-navigation__main-heading", text: "Related content"),
- "Related navigation 'Related content' section not found"
-
- sections = [sections] unless sections.is_a?(Array)
- sections.each do |section|
- assert_has_related_navigation_section_and_links(
- section[:section_name], section[:section_text], section[:links]
- )
- end
- end
- end
-
def has_component_metadata(key, value)
assert page.has_css? "meta[#{key}=\"#{value}\"]", visible: false
end