diff --git a/app/controllers/development_controller.rb b/app/controllers/development_controller.rb index 14bbe1421..e5bca762c 100644 --- a/app/controllers/development_controller.rb +++ b/app/controllers/development_controller.rb @@ -12,7 +12,6 @@ def index document_collection fatality_notice guide - help_page html_publication news_article placeholder_corporate_information_page diff --git a/app/presenters/document_collection_presenter.rb b/app/presenters/document_collection_presenter.rb index d94fb03b1..040b7a757 100644 --- a/app/presenters/document_collection_presenter.rb +++ b/app/presenters/document_collection_presenter.rb @@ -64,7 +64,6 @@ def group_document_link_public_updated_at(link) disallowed_document_types = %w[answer completed_transaction guide - help_page local_transaction place simple_smart_answer diff --git a/app/presenters/help_page_presenter.rb b/app/presenters/help_page_presenter.rb deleted file mode 100644 index efa29accd..000000000 --- a/app/presenters/help_page_presenter.rb +++ /dev/null @@ -1,4 +0,0 @@ -class HelpPagePresenter < ContentItemPresenter - include ContentItem::Body - include ContentItem::LastUpdated -end diff --git a/app/views/content_items/_body_with_related_links.html.erb b/app/views/content_items/_body_with_related_links.html.erb index b44eb193d..e68b8ce3f 100644 --- a/app/views/content_items/_body_with_related_links.html.erb +++ b/app/views/content_items/_body_with_related_links.html.erb @@ -16,11 +16,6 @@ <%= raw(@content_item.body) %> <% end %> - <% if @content_item.last_updated && @content_item.schema_name == "help_page" %> - <%= render "components/published_dates", { - last_updated: @content_item.last_updated - } %> - <% end %> <%= render 'shared/sidebar_navigation' %> diff --git a/app/views/content_items/help_page.html.erb b/app/views/content_items/help_page.html.erb deleted file mode 100644 index 8b60b5364..000000000 --- a/app/views/content_items/help_page.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -<% content_for :extra_head_content do %> - <%= machine_readable_metadata( - schema: :article - ) %> - <% if @content_item.base_path == '/help/cookie-details' %> - - <% end %> -<% end %> - -<%= render 'content_items/body_with_related_links' %> diff --git a/config/govuk_examples.yml b/config/govuk_examples.yml index f19693a31..84bbd57cc 100644 --- a/config/govuk_examples.yml +++ b/config/govuk_examples.yml @@ -55,16 +55,6 @@ rtl_publication_1: /government/publications/saudi-arabia-country-of-concern--2/9 rtl_publication_2: /government/publications/apply-for-a-uk-visa-in-saudi-arabia/%D8%B7%D9%84%D8%A8-%D8%AA%D8%A3%D8%B4%D9%8A%D8%B1%D8%A9-%D9%84%D9%84%D9%85%D9%84%D9%83%D8%A9-%D8%A7%D9%84%D9%85%D8%AA%D8%AD%D8%AF%D8%A9-%D9%85%D9%86-%D8%A7%D9%84%D9%85%D9%85%D9%84%D9%83%D8%A9-%D8%A7%D9%84%D8%B9%D8%B1%D8%A8%D9%8A%D8%A9-%D8%A7%D9%84%D8%B3%D8%B9%D9%88%D8%AF%D9%8A%D8%A9-%D8%B9%D9%85%D9%84%D9%8A%D8%A9-%D8%A7%D9%84%D8%B7%D9%84%D8%A8 rtl_publication_3: /government/publications/apply-for-a-uk-visa-in-kuwait/%D8%B7%D9%84%D8%A8-%D8%AA%D8%A3%D8%B4%D9%8A%D8%B1%D8%A9-%D9%84%D8%AF%D9%88%D9%84%D8%A9-%D9%85%D9%86-%D8%AF%D9%88%D9%84-%D8%A7%D9%84%D9%83%D9%88%D9%85%D9%88%D9%86%D9%88%D9%84%D8%AB-%D8%A3%D9%88-%D8%A3%D9%82%D8%A7%D9%84%D9%8A%D9%85-%D9%85%D8%A7-%D9%88%D8%B1%D8%A7%D8%A1-%D8%A7%D9%84%D8%A8%D8%AD%D8%A7%D8%B1-%D8%A7%D9%84%D8%A8%D8%B1%D9%8A%D8%B7%D8%A7%D9%86%D9%8A%D8%A9-%D9%85%D9%86-%D8%A7%D8%B3%D9%85-%D8%A7%D9%84%D8%AF%D9%88%D9%84%D8%A9 -# Most popular from https://docs.publishing.service.gov.uk/document-types/help+page.html (19 April 2017) -help_page_0: '/help/cookies' -help_page_1: '/help/accessibility' -help_page_2: '/help/browsers' -help_page_3: '/help/terms-conditions' -help_page_4: '/help/beta' -help_page_5: '/help/privacy-policy' -help_page_6: '/help/about-govuk' -help_page_7: '/help/update-email-notifications' - # Most popular guides (8 May 2017) guide_0: '/log-in-register-hmrc-online-services' guide_1: '/log-in-file-self-assessment-tax-return' diff --git a/test/integration/help_page_test.rb b/test/integration/help_page_test.rb deleted file mode 100644 index a550b9cd1..000000000 --- a/test/integration/help_page_test.rb +++ /dev/null @@ -1,26 +0,0 @@ -require "test_helper" - -class HelpPageTest < ActionDispatch::IntegrationTest - test "renders title and body" do - setup_and_visit_content_item("help_page") - - assert page.has_text?(@content_item["title"]) - assert page.has_text?("GOV.UK puts small files (known as ‘cookies’) onto your computer to collect information about how you browse the site.") - assert_has_published_dates(@content_item["last_updated"]) - end - - test "sets noindex meta tag for '/help/cookie-details'" do - @content_item = get_content_example("help_page").tap do |item| - item["base_path"] = "/help/cookie-details" - stub_content_store_has_item(item["base_path"], item.to_json) - visit_with_cachebust(item["base_path"]) - end - - assert page.has_css?('meta[name="robots"][content="noindex"]', visible: false) - end - - test "does not render with the single page notification button" do - setup_and_visit_content_item("help_page") - assert_not page.has_css?(".gem-c-single-page-notification-button") - end -end diff --git a/test/presenters/document_collection_presenter_test.rb b/test/presenters/document_collection_presenter_test.rb index 35d5c13f2..e660cc3ad 100644 --- a/test/presenters/document_collection_presenter_test.rb +++ b/test/presenters/document_collection_presenter_test.rb @@ -99,7 +99,6 @@ class PresentedDocumentCollection < TestCase disallowed_document_types = %w[answer completed_transaction guide - help_page local_transaction place simple_smart_answer diff --git a/test/presenters/help_page_presenter_test.rb b/test/presenters/help_page_presenter_test.rb deleted file mode 100644 index af71a73ec..000000000 --- a/test/presenters/help_page_presenter_test.rb +++ /dev/null @@ -1,15 +0,0 @@ -require "presenter_test_helper" - -class HelpPagePresenterTest < PresenterTestCase - def schema_name - "help_page" - end - - test "presents the title" do - assert_equal schema_item["title"], presented_item.title - end - - test "presents the body" do - assert_equal schema_item["details"]["body"], presented_item.body - end -end