From c4988aeaf7c39592d403f2fecdc8b8f1e33435cc Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Thu, 31 May 2018 10:07:58 +0000 Subject: [PATCH 1/6] Remove notice component --- .../stylesheets/components/_notice.scss | 33 --------- app/views/components/_notice.html.erb | 22 ------ app/views/components/docs/notice.yml | 23 ------- test/components/notice_test.rb | 67 ------------------- 4 files changed, 145 deletions(-) delete mode 100644 app/assets/stylesheets/components/_notice.scss delete mode 100644 app/views/components/_notice.html.erb delete mode 100644 app/views/components/docs/notice.yml delete mode 100644 test/components/notice_test.rb diff --git a/app/assets/stylesheets/components/_notice.scss b/app/assets/stylesheets/components/_notice.scss deleted file mode 100644 index b52537c42..000000000 --- a/app/assets/stylesheets/components/_notice.scss +++ /dev/null @@ -1,33 +0,0 @@ -.app-c-notice { - clear: both; - padding: $gutter-two-thirds; - border: 2px solid $govuk-blue; - - @include media(mobile) { - padding: $gutter-half; - } - - .govuk-govspeak { - p:last-child { - margin-bottom: 0; - } - } -} - -.app-c-notice--bottom-margin { - @include responsive-bottom-margin; -} - -.app-c-notice__title { - @include bold-27; - margin-bottom: $gutter-one-third; - - &:last-child { - margin-bottom: 0; - } -} - -.app-c-notice__description { - @include core-19; - margin-bottom: 0; -} diff --git a/app/views/components/_notice.html.erb b/app/views/components/_notice.html.erb deleted file mode 100644 index 8a1e560a7..000000000 --- a/app/views/components/_notice.html.erb +++ /dev/null @@ -1,22 +0,0 @@ -<% if defined?(title) %> - <% - description_text ||= false - description_govspeak ||= false - margin_bottom_class = " app-c-notice--bottom-margin" unless local_assigns[:margin_bottom] - %> -
- <% if description_text || description_govspeak %> -

<%= title %>

- <% else %> - <%= title %> - <% end %> - - <% if description_text %> -

<%= description_text %>

- <% end %> - - <% if description_govspeak %> - <%= render 'govuk_component/govspeak', content: description_govspeak %> - <% end %> -
-<% end %> diff --git a/app/views/components/docs/notice.yml b/app/views/components/docs/notice.yml deleted file mode 100644 index 1482887a0..000000000 --- a/app/views/components/docs/notice.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Notice -description: A notice to convey and highlight information -body: | - The notice component replaces the notice and withdrawal notice patterns on GOV.UK. - - The component accepts either a simple string description_text parameter that it wraps in a paragraph, or a description_govspeak parameter that is rendered through govspeak for more complex HTML layout. -accessibility_criteria: | - The notice must: - - - have a border colour contrast ratio of more than 4.5:1 with its background to be visually distinct. - - always render headings with associated description content, so there are no isolated heading elements inside the component -examples: - default: - data: - title: 'Statistics release cancelled' - with_description_text: - data: - title: 'Statistics release cancelled' - description_text: 'Duplicate, added in error' - with_description_govspeak: - data: - title: 'Statistics release update' - description_govspeak: '

The Oil & Gas Authority launched a new website on 3 October 2016 to reflect its new status as a government company.

This formalises the transfer of the Secretary of State’s regulatory powers in respect of oil and gas to the OGA, and grants it new powers. This website will no longer be updated. Visitors should refer to www.ogauthority.co.uk

' diff --git a/test/components/notice_test.rb b/test/components/notice_test.rb deleted file mode 100644 index ec79a6eb4..000000000 --- a/test/components/notice_test.rb +++ /dev/null @@ -1,67 +0,0 @@ -require 'component_test_helper' - -class NoticeTest < ComponentTestCase - def component_name - "notice" - end - - test "fails to render when no parameters are given" do - assert_empty render_component({}) - end -end - -# This component renders some content using govspeak, which cannot currently be tested using the approach above. -# To cover this gap, below is an integration test that loads the notice page in the component guide in order to test -# that the remaining aspects of the component are being rendered correctly. - -class NoticeGovspeakTest < ActionDispatch::IntegrationTest - test "renders a notice with only a title and no description" do - visit '/component-guide/notice/default' - - within '.component-guide-preview' do - assert page.has_selector?(".app-c-notice__title", text: "Statistics release cancelled") - assert page.has_no_selector?(".app-c-notice__description") - end - end - - test "renders a notice with an aria label and region" do - visit '/component-guide/notice/default' - assert page.has_selector?(".component-guide-preview section[aria-label][role=region]") - end - - test "renders a notice with a title and description text" do - visit '/component-guide/notice/with_description_text' - - within '.component-guide-preview' do - assert page.has_selector?(".app-c-notice__title", text: "Statistics release cancelled") - assert page.has_selector?(".app-c-notice__description", text: "Duplicate, added in error") - end - end - - test "renders a notice with a title and description govspeak" do - visit '/component-guide/notice/with_description_govspeak' - - within '.component-guide-preview' do - assert page.has_selector?(".app-c-notice__title", text: "Statistics release update") - assert_has_component_govspeak("

The Oil & Gas Authority launched a new website on 3 October 2016 to reflect its new status as a government company.

This formalises the transfer of the Secretary of State’s regulatory powers in respect of oil and gas to the OGA, and grants it new powers. This website will no longer be updated. Visitors should refer to www.ogauthority.co.uk

") - end - end - - test "renders title as heading only if description present" do - visit '/component-guide/notice/with_description_text' - - within '.component-guide-preview' do - assert page.has_selector?("h2.app-c-notice__title", text: "Statistics release cancelled") - assert page.has_selector?("p.app-c-notice__description", text: "Duplicate, added in error") - end - end - - test "render title as paragraph if no description present" do - visit '/component-guide/notice/default' - - within '.component-guide-preview' do - assert page.has_selector?("span.app-c-notice__title", text: "Statistics release cancelled") - assert page.has_no_selector?(".app-c-notice__description") - end - end -end From 7812977f55da2489a134046e4bd9de5b1f01f4a0 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Thu, 31 May 2018 10:08:14 +0000 Subject: [PATCH 2/6] Use notice component from gem --- app/views/content_items/case_study.html.erb | 2 +- app/views/content_items/consultation.html.erb | 8 ++++---- .../content_items/corporate_information_page.html.erb | 2 +- app/views/content_items/detailed_guide.html.erb | 2 +- app/views/content_items/document_collection.html.erb | 2 +- app/views/content_items/fatality_notice.html.erb | 2 +- app/views/content_items/html_publication.html.erb | 2 +- app/views/content_items/news_article.html.erb | 2 +- app/views/content_items/publication.html.erb | 2 +- app/views/content_items/speech.html.erb | 2 +- app/views/content_items/statistical_data_set.html.erb | 2 +- app/views/content_items/statistics_announcement.html.erb | 4 ++-- .../content_items/world_location_news_article.html.erb | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb index 13e1b8574..2ba6522a4 100644 --- a/app/views/content_items/case_study.html.erb +++ b/app/views/content_items/case_study.html.erb @@ -15,7 +15,7 @@ <%= render 'shared/publisher_metadata_with_logo' %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb index 69db3b150..f1575319b 100644 --- a/app/views/content_items/consultation.html.erb +++ b/app/views/content_items/consultation.html.erb @@ -13,7 +13,7 @@ <%= render 'shared/publisher_metadata_with_logo', content_item: @content_item %> <%= render 'shared/history_notice', content_item: @content_item %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
@@ -25,16 +25,16 @@ <% if @content_item.opening_date_midnight? %>on<% else %>at<% end %> <% end %> - <%= render 'components/notice', title: "This consultation isn't open yet", description_text: content_item_unopened %> + <%= render 'govuk_publishing_components/components/notice', title: "This consultation isn't open yet", description_text: content_item_unopened %> <% elsif @content_item.pending_final_outcome? %> <% content_item_final_outcome = capture do %> Visit this page again soon to download the outcome to this public feedback. <% end %> - <%= render 'components/notice', title: 'We are analysing your feedback', description_text: content_item_final_outcome, margin_bottom: 0 %> + <%= render 'govuk_publishing_components/components/notice', title: 'We are analysing your feedback', description_text: content_item_final_outcome, margin_bottom: 0 %> <% elsif @content_item.final_outcome? %> - <%= render 'components/notice', title: 'This consultation has concluded' %> + <%= render 'govuk_publishing_components/components/notice', title: 'This consultation has concluded' %> <% if @content_item.final_outcome_documents? %> <%= render 'govuk_publishing_components/components/heading', text: "Download the full outcome", mobile_top_margin: true %> diff --git a/app/views/content_items/corporate_information_page.html.erb b/app/views/content_items/corporate_information_page.html.erb index ee761c8d3..060f9dc15 100644 --- a/app/views/content_items/corporate_information_page.html.erb +++ b/app/views/content_items/corporate_information_page.html.erb @@ -39,7 +39,7 @@ <%= render 'shared/translations' %>
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> - <%= render 'components/notice', @content_item.withdrawal_notice_component %> + <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb index 2c6662703..aef987861 100644 --- a/app/views/content_items/detailed_guide.html.erb +++ b/app/views/content_items/detailed_guide.html.erb @@ -16,7 +16,7 @@ <%= render 'shared/publisher_metadata_with_logo' %> <%= render 'shared/history_notice', content_item: @content_item %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb index e2b43039a..7ad2c6665 100644 --- a/app/views/content_items/document_collection.html.erb +++ b/app/views/content_items/document_collection.html.erb @@ -14,7 +14,7 @@ <%= render 'shared/translations', content_item: @content_item %>
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> - <%= render 'components/notice', @content_item.withdrawal_notice_component %> + <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> <%= render 'shared/history_notice', content_item: @content_item %>
diff --git a/app/views/content_items/fatality_notice.html.erb b/app/views/content_items/fatality_notice.html.erb index cf148090c..6c1233257 100644 --- a/app/views/content_items/fatality_notice.html.erb +++ b/app/views/content_items/fatality_notice.html.erb @@ -15,7 +15,7 @@
<%= render 'shared/publisher_metadata_with_logo' %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb index 0ea82908b..9bc5b5e34 100644 --- a/app/views/content_items/html_publication.html.erb +++ b/app/views/content_items/html_publication.html.erb @@ -28,7 +28,7 @@

<%= @content_item.last_changed %>

<% end %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
<%= render 'shared/history_notice', content_item: @content_item %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
diff --git a/app/views/content_items/publication.html.erb b/app/views/content_items/publication.html.erb index 26192474e..3a5bc32f9 100644 --- a/app/views/content_items/publication.html.erb +++ b/app/views/content_items/publication.html.erb @@ -20,7 +20,7 @@ <%= render 'shared/publisher_metadata_with_logo' %> <%= render 'shared/history_notice', content_item: @content_item %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
diff --git a/app/views/content_items/speech.html.erb b/app/views/content_items/speech.html.erb index ceb0800c6..8dc816daa 100644 --- a/app/views/content_items/speech.html.erb +++ b/app/views/content_items/speech.html.erb @@ -16,7 +16,7 @@ <%= render 'shared/publisher_metadata_with_logo' %> <%= render 'shared/history_notice', content_item: @content_item %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
diff --git a/app/views/content_items/statistical_data_set.html.erb b/app/views/content_items/statistical_data_set.html.erb index 7f6ad50be..5d4b2b15c 100644 --- a/app/views/content_items/statistical_data_set.html.erb +++ b/app/views/content_items/statistical_data_set.html.erb @@ -14,7 +14,7 @@ <%= render 'shared/translations', content_item: @content_item %>
<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> - <%= render 'components/notice', @content_item.withdrawal_notice_component %> + <%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %> <%= render 'shared/history_notice', content_item: @content_item %>
diff --git a/app/views/content_items/statistics_announcement.html.erb b/app/views/content_items/statistics_announcement.html.erb index b2adc64e3..f43793472 100644 --- a/app/views/content_items/statistics_announcement.html.erb +++ b/app/views/content_items/statistics_announcement.html.erb @@ -33,13 +33,13 @@ <% end %> <% if @content_item.cancelled? %> - <%= render 'components/notice', + <%= render 'govuk_publishing_components/components/notice', title: 'Statistics release cancelled', description_text: @content_item.cancellation_reason %> <% end %> <% if @content_item.forthcoming_publication? %> - <%= render 'components/notice', + <%= render 'govuk_publishing_components/components/notice', title: nbsp_between_last_two_words(@content_item.forthcoming_notice_title) %> <% end %>
diff --git a/app/views/content_items/world_location_news_article.html.erb b/app/views/content_items/world_location_news_article.html.erb index 5e86963f9..4f55c99c8 100644 --- a/app/views/content_items/world_location_news_article.html.erb +++ b/app/views/content_items/world_location_news_article.html.erb @@ -16,7 +16,7 @@ <%= render 'shared/publisher_metadata_with_logo' %> <%= render 'shared/history_notice', content_item: @content_item %> -<%= render 'components/notice', @content_item.withdrawal_notice_component %> +<%= render 'govuk_publishing_components/components/notice', @content_item.withdrawal_notice_component %>
From c74bee41b3ff7c109e44aa5edeae2da82f43656e Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Thu, 31 May 2018 10:08:27 +0000 Subject: [PATCH 3/6] Update tests --- test/integration/case_study_test.rb | 2 +- test/integration/consultation_test.rb | 6 +++--- test/integration/corporate_information_page_test.rb | 4 ++-- test/integration/detailed_guide_test.rb | 2 +- test/integration/document_collection_test.rb | 2 +- test/integration/fatality_notice_test.rb | 4 ++-- test/integration/html_publication_test.rb | 6 +++--- test/integration/publication_test.rb | 2 +- test/integration/statistical_data_set_test.rb | 2 +- test/integration/statistics_announcement_test.rb | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/integration/case_study_test.rb b/test/integration/case_study_test.rb index 98b8d4c09..d242755a8 100644 --- a/test/integration/case_study_test.rb +++ b/test/integration/case_study_test.rb @@ -20,7 +20,7 @@ class CaseStudyTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - within ".app-c-notice" do + within ".gem-c-notice" do assert page.has_text?('This case study was withdrawn'), "is withdrawn" assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") diff --git a/test/integration/consultation_test.rb b/test/integration/consultation_test.rb index 590301ce7..a3a329c86 100644 --- a/test/integration/consultation_test.rb +++ b/test/integration/consultation_test.rb @@ -50,7 +50,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest # There’s no daylight savings after 2037 # http://timezonesjl.readthedocs.io/en/stable/faq/#far-future-zoneddatetime-with-variabletimezone - assert page.has_css?('.app-c-notice', text: "This consultation opens at 1pm on 5 October 2200") + assert page.has_css?('.gem-c-notice', text: "This consultation opens at 1pm on 5 October 2200") assert page.has_text?("It closes at 4pm on 31 October 2210") end @@ -58,7 +58,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('closed_consultation') assert page.has_text?("Closed consultation") - assert page.has_css?('.app-c-notice', text: "We are analysing your feedback") + assert page.has_css?('.gem-c-notice', text: "We are analysing your feedback") assert page.has_text?("ran from") assert page.has_text?("2pm on 5 September 2016 to 4pm on 31 October 2016") @@ -68,7 +68,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('consultation_outcome') assert page.has_text?("Consultation outcome") - assert page.has_css?('.app-c-notice', text: "This consultation has concluded") + assert page.has_css?('.gem-c-notice', text: "This consultation has concluded") assert page.has_css?('h2', text: "Original consultation") assert page.has_text?("ran from") assert page.has_text?("4pm on 20 April 2016 to 10:45pm on 13 July 2016") diff --git a/test/integration/corporate_information_page_test.rb b/test/integration/corporate_information_page_test.rb index 1ad2617a0..6b2e7cfb5 100644 --- a/test/integration/corporate_information_page_test.rb +++ b/test/integration/corporate_information_page_test.rb @@ -110,7 +110,7 @@ class CorporateInformationPageTest < ActionDispatch::IntegrationTest visit "/government/organisations/department-of-health/about" - assert page.has_css?(".app-c-notice__title", text: "This information page was withdrawn on 9 August 2014") - assert page.has_css?(".app-c-notice", text: "This is out of date") + assert page.has_css?(".gem-c-notice__title", text: "This information page was withdrawn on 9 August 2014") + assert page.has_css?(".gem-c-notice", text: "This is out of date") end end diff --git a/test/integration/detailed_guide_test.rb b/test/integration/detailed_guide_test.rb index 011d299a9..f77ef8138 100644 --- a/test/integration/detailed_guide_test.rb +++ b/test/integration/detailed_guide_test.rb @@ -34,7 +34,7 @@ class DetailedGuideTest < ActionDispatch::IntegrationTest assert page.has_css?('title', text: "[Withdrawn]", visible: false) - within ".app-c-notice" do + within ".gem-c-notice" do assert page.has_text?('This guidance was withdrawn'), "is withdrawn" assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") diff --git a/test/integration/document_collection_test.rb b/test/integration/document_collection_test.rb index 12d5354b3..224e4d758 100644 --- a/test/integration/document_collection_test.rb +++ b/test/integration/document_collection_test.rb @@ -142,7 +142,7 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('document_collection_withdrawn') assert page.has_css?('title', text: "[Withdrawn]", visible: false) - within ".app-c-notice" do + within ".gem-c-notice" do assert page.has_text?('This collection was withdrawn'), "is withdrawn" assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") diff --git a/test/integration/fatality_notice_test.rb b/test/integration/fatality_notice_test.rb index a712b8225..256950a58 100644 --- a/test/integration/fatality_notice_test.rb +++ b/test/integration/fatality_notice_test.rb @@ -18,7 +18,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest assert_component_parameter("title", "context", "Operations in Zululand") assert_has_component_title("Sir George Pomeroy Colley killed in Boer War") - refute page.has_css?(".app-c-notice") + refute page.has_css?(".gem-c-notice") assert_has_publisher_metadata( published: "Published 27 February 1881", @@ -74,7 +74,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest "[Withdrawn] Sir George Pomeroy Colley killed in Boer War - Fatality notice - GOV.UK" ) - within ".app-c-notice" do + within ".gem-c-notice" do assert_text("This fatality notice was withdrawn on 14 September 2016") assert_has_component_govspeak( diff --git a/test/integration/html_publication_test.rb b/test/integration/html_publication_test.rb index 2c46c48ad..6ece184b2 100644 --- a/test/integration/html_publication_test.rb +++ b/test/integration/html_publication_test.rb @@ -99,8 +99,8 @@ def assert_has_component_organisation_logo_with_brand(brand, index = 1) content_store_has_item("/government/publications/canada-united-kingdom-joint-declaration/canada-united-kingdom-joint-declaration", content_item.to_json) visit "/government/publications/canada-united-kingdom-joint-declaration/canada-united-kingdom-joint-declaration" - assert page.has_css?(".app-c-notice__title", text: "This policy paper was withdrawn on 9 August 2014") - assert page.has_css?(".app-c-notice", text: "This is out of date") + assert page.has_css?(".gem-c-notice__title", text: "This policy paper was withdrawn on 9 August 2014") + assert page.has_css?(".gem-c-notice", text: "This is out of date") end test "if document has no parent document_type 'publication' is shown" do @@ -114,6 +114,6 @@ def assert_has_component_organisation_logo_with_brand(brand, index = 1) content_store_has_item("/government/publications/canada-united-kingdom-joint-declaration/canada-united-kingdom-joint-declaration", content_item.to_json) visit "/government/publications/canada-united-kingdom-joint-declaration/canada-united-kingdom-joint-declaration" - assert page.has_css?(".app-c-notice__title", text: "This publication was withdrawn on 9 August 2014") + assert page.has_css?(".gem-c-notice__title", text: "This publication was withdrawn on 9 August 2014") end end diff --git a/test/integration/publication_test.rb b/test/integration/publication_test.rb index 7abdc4d9b..836101e39 100644 --- a/test/integration/publication_test.rb +++ b/test/integration/publication_test.rb @@ -43,7 +43,7 @@ class PublicationTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('withdrawn_publication') assert page.has_css?('title', text: "[Withdrawn]", visible: false) - within ".app-c-notice" do + within ".gem-c-notice" do assert page.has_text?('This publication was withdrawn'), "is withdrawn" assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") diff --git a/test/integration/statistical_data_set_test.rb b/test/integration/statistical_data_set_test.rb index 84a388f66..69cfeb213 100644 --- a/test/integration/statistical_data_set_test.rb +++ b/test/integration/statistical_data_set_test.rb @@ -28,7 +28,7 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest withdrawn_notice_explanation = @content_item["withdrawn_notice"]["explanation"] withdrawn_at = @content_item["withdrawn_notice"]["withdrawn_at"] - within ".app-c-notice" do + within ".gem-c-notice" do assert page.has_text?("This statistical data set was withdrawn"), "is withdrawn" assert_has_component_govspeak(withdrawn_notice_explanation) assert page.has_css?("time[datetime='#{withdrawn_at}']") diff --git a/test/integration/statistics_announcement_test.rb b/test/integration/statistics_announcement_test.rb index a0520c1a6..020941dba 100644 --- a/test/integration/statistics_announcement_test.rb +++ b/test/integration/statistics_announcement_test.rb @@ -27,7 +27,7 @@ class StatisticsAnnouncementTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - within '.app-c-notice' do + within '.gem-c-notice' do assert page.has_text?('Statistics release cancelled'), "is cancelled" assert page.has_text?(@content_item["details"]["cancellation_reason"]), "displays cancelleation reason" end @@ -57,7 +57,7 @@ class StatisticsAnnouncementTest < ActionDispatch::IntegrationTest test "statistics announcement that are not cancelled display forthcoming notice" do setup_and_visit_content_item('official_statistics') - within(".app-c-notice") do + within(".gem-c-notice") do assert_text "#{StatisticsAnnouncementPresenter::FORTHCOMING_NOTICE} on #{@content_item['details']['display_date']}" end end From 37d0e62d81887d330f7b9b8e19cc078408cfa098 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Mon, 4 Jun 2018 08:54:32 +0000 Subject: [PATCH 4/6] Use govspeak components from gem --- .../_body_with_related_links.html.erb | 2 +- .../_document_collection_body.html.erb | 4 ++-- .../_publication_inline_body.html.erb | 4 ++-- app/views/content_items/case_study.html.erb | 2 +- app/views/content_items/consultation.html.erb | 14 +++++++------- app/views/content_items/contact.html.erb | 2 +- .../corporate_information_page.html.erb | 2 +- app/views/content_items/detailed_guide.html.erb | 2 +- app/views/content_items/fatality_notice.html.erb | 2 +- app/views/content_items/gone.html.erb | 2 +- app/views/content_items/guide.html+print.erb | 2 +- app/views/content_items/guide.html.erb | 2 +- app/views/content_items/html_publication.html.erb | 2 +- app/views/content_items/news_article.html.erb | 2 +- .../service_sign_in/_choose_sign_in.html.erb | 2 +- .../service_sign_in/_create_new_account.html.erb | 2 +- .../content_items/specialist_document.html.erb | 2 +- app/views/content_items/speech.html.erb | 2 +- .../content_items/statistical_data_set.html.erb | 2 +- app/views/content_items/take_part.html.erb | 2 +- .../topical_event_about_page.html.erb | 2 +- .../content_items/travel_advice.html+print.erb | 2 +- app/views/content_items/travel_advice.html.erb | 2 +- app/views/content_items/unpublishing.html.erb | 2 +- app/views/content_items/working_group.html.erb | 2 +- .../world_location_news_article.html.erb | 2 +- app/views/development/index.html.erb | 2 +- app/views/shared/_travel_advice_summary.html.erb | 2 +- 28 files changed, 36 insertions(+), 36 deletions(-) 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 86c804fa3..a03de38dd 100644 --- a/app/views/content_items/_body_with_related_links.html.erb +++ b/app/views/content_items/_body_with_related_links.html.erb @@ -9,7 +9,7 @@
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction, disable_youtube_expansions: true, diff --git a/app/views/content_items/_document_collection_body.html.erb b/app/views/content_items/_document_collection_body.html.erb index 51e5384a4..da75b7b75 100644 --- a/app/views/content_items/_document_collection_body.html.erb +++ b/app/views/content_items/_document_collection_body.html.erb @@ -1,11 +1,11 @@ <% if @content_item.body.present? %> - <%= render 'govuk_component/govspeak', @content_item.govspeak_body %> + <%= render 'govuk_publishing_components/components/govspeak', @content_item.govspeak_body %> <% end %> <% @content_item.groups.each_with_index do |group, group_index| %> <%= @content_item.group_heading(group) %> <% if group["body"].present? %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: group["body"], direction: page_text_direction %> <% end %> diff --git a/app/views/content_items/_publication_inline_body.html.erb b/app/views/content_items/_publication_inline_body.html.erb index a6072376b..79104f067 100644 --- a/app/views/content_items/_publication_inline_body.html.erb +++ b/app/views/content_items/_publication_inline_body.html.erb @@ -4,7 +4,7 @@ mobile_top_margin: true %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.documents, direction: page_text_direction %>
@@ -15,7 +15,7 @@ mobile_top_margin: true %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.details, direction: page_text_direction %>
diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb index 2ba6522a4..ec9926eb3 100644 --- a/app/views/content_items/case_study.html.erb +++ b/app/views/content_items/case_study.html.erb @@ -25,7 +25,7 @@ alt: @content_item.image["alt_text"], caption: @content_item.image["caption"] if @content_item.image %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %>
diff --git a/app/views/content_items/consultation.html.erb b/app/views/content_items/consultation.html.erb index f1575319b..999e96331 100644 --- a/app/views/content_items/consultation.html.erb +++ b/app/views/content_items/consultation.html.erb @@ -39,7 +39,7 @@ <% if @content_item.final_outcome_documents? %> <%= render 'govuk_publishing_components/components/heading', text: "Download the full outcome", mobile_top_margin: true %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.final_outcome_documents, direction: page_text_direction %>
@@ -47,7 +47,7 @@ <%= render 'govuk_publishing_components/components/heading', text: "Detail of outcome", mobile_top_margin: true %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.final_outcome_detail, direction: page_text_direction %>
@@ -56,7 +56,7 @@ <% if @content_item.public_feedback_documents? %> <%= render 'govuk_publishing_components/components/heading', text: "Feedback received", mobile_top_margin: true %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.public_feedback_documents, direction: page_text_direction %>
@@ -65,7 +65,7 @@ <% if @content_item.public_feedback_detail %> <%= render 'govuk_publishing_components/components/heading', text: "Detail of feedback received", mobile_top_margin: true %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.public_feedback_detail, direction: page_text_direction %>
@@ -109,12 +109,12 @@
<%= render 'govuk_publishing_components/components/heading', text: "Consultation description", mobile_top_margin: true %> - <%= render 'govuk_component/govspeak', @content_item.govspeak_body %> + <%= render 'govuk_publishing_components/components/govspeak', @content_item.govspeak_body %> <% if @content_item.documents? %> <%= render 'govuk_publishing_components/components/heading', text: "Documents", mobile_top_margin: true %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.documents, direction: page_text_direction %>
@@ -157,7 +157,7 @@ <% end %> <% end %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @ways_to_respond_body, direction: page_text_direction %>
diff --git a/app/views/content_items/contact.html.erb b/app/views/content_items/contact.html.erb index 6da8022b0..9b3c64ee0 100644 --- a/app/views/content_items/contact.html.erb +++ b/app/views/content_items/contact.html.erb @@ -101,7 +101,7 @@ <% end %> <% end %> - <%= render 'govuk_component/govspeak', content: body, rich_govspeak: true %> + <%= render 'govuk_publishing_components/components/govspeak', content: body, rich_govspeak: true %>
<%= render 'shared/sidebar_navigation' %>
diff --git a/app/views/content_items/corporate_information_page.html.erb b/app/views/content_items/corporate_information_page.html.erb index 060f9dc15..4c988da47 100644 --- a/app/views/content_items/corporate_information_page.html.erb +++ b/app/views/content_items/corporate_information_page.html.erb @@ -47,7 +47,7 @@
<%= render "components/contents-list-with-body", contents: @content_item.contents do %>
- <%= render 'govuk_component/govspeak', content: "#{@content_item.body}#{@additional_body}" %> + <%= render 'govuk_publishing_components/components/govspeak', content: "#{@content_item.body}#{@additional_body}" %>
<% end %>
diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb index aef987861..b7fa406fe 100644 --- a/app/views/content_items/detailed_guide.html.erb +++ b/app/views/content_items/detailed_guide.html.erb @@ -23,7 +23,7 @@ <%= render 'components/important-metadata', items: @content_item.important_metadata %> <%= render "components/contents-list-with-body", contents: @content_item.contents do %> - <%= render 'govuk_component/govspeak', @content_item.govspeak_body %> + <%= render 'govuk_publishing_components/components/govspeak', @content_item.govspeak_body %>
<%= render 'components/published-dates', { diff --git a/app/views/content_items/fatality_notice.html.erb b/app/views/content_items/fatality_notice.html.erb index 6c1233257..87eea550f 100644 --- a/app/views/content_items/fatality_notice.html.erb +++ b/app/views/content_items/fatality_notice.html.erb @@ -26,7 +26,7 @@ src: @content_item.image["url"], alt: @content_item.image["alt_text"], caption: @content_item.image["caption"] if @content_item.image %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %>
diff --git a/app/views/content_items/gone.html.erb b/app/views/content_items/gone.html.erb index ab4bd799b..d14ad84fc 100644 --- a/app/views/content_items/gone.html.erb +++ b/app/views/content_items/gone.html.erb @@ -6,7 +6,7 @@ The information on this page has been removed because it was published in error.

- <%= render 'govuk_component/govspeak', content: @content_item.explanation %> + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.explanation %> <% if @content_item.alternative_path.present? %>

diff --git a/app/views/content_items/guide.html+print.erb b/app/views/content_items/guide.html+print.erb index 44dd4ed14..e84a7030b 100644 --- a/app/views/content_items/guide.html+print.erb +++ b/app/views/content_items/guide.html+print.erb @@ -14,7 +14,7 @@

<%= "#{index + 1}. #{part['title']}" %>

- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: part['body'], direction: page_text_direction, disable_youtube_expansions: true, diff --git a/app/views/content_items/guide.html.erb b/app/views/content_items/guide.html.erb index 519ccda93..e5d3f565b 100644 --- a/app/views/content_items/guide.html.erb +++ b/app/views/content_items/guide.html.erb @@ -23,7 +23,7 @@ <%= @content_item.current_part_title %> <% end %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.current_part_body, direction: page_text_direction, disable_youtube_expansions: true, diff --git a/app/views/content_items/html_publication.html.erb b/app/views/content_items/html_publication.html.erb index 9bc5b5e34..309f08e03 100644 --- a/app/views/content_items/html_publication.html.erb +++ b/app/views/content_items/html_publication.html.erb @@ -48,7 +48,7 @@
- <%= render 'govuk_component/govspeak_html_publication', @content_item.govspeak_body %> + <%= render 'govuk_publishing_components/components/govspeak_html_publication', @content_item.govspeak_body %>
diff --git a/app/views/content_items/news_article.html.erb b/app/views/content_items/news_article.html.erb index 8b00c5873..1ae6441b5 100644 --- a/app/views/content_items/news_article.html.erb +++ b/app/views/content_items/news_article.html.erb @@ -25,7 +25,7 @@ src: @content_item.image["url"], alt: @content_item.image["alt_text"], caption: @content_item.image["caption"] if @content_item.image %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %>
diff --git a/app/views/content_items/service_sign_in/_choose_sign_in.html.erb b/app/views/content_items/service_sign_in/_choose_sign_in.html.erb index 1385ae3db..b772eb100 100644 --- a/app/views/content_items/service_sign_in/_choose_sign_in.html.erb +++ b/app/views/content_items/service_sign_in/_choose_sign_in.html.erb @@ -21,7 +21,7 @@ <%= render "govuk_publishing_components/components/fieldset", legend_text: legend_text do %>
- <%= render 'govuk_component/govspeak', content: @content_item.description %> + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.description %> <% if @error %> <%= render "components/error-message", text: t('service_sign_in.error.option') %> <% end %> diff --git a/app/views/content_items/service_sign_in/_create_new_account.html.erb b/app/views/content_items/service_sign_in/_create_new_account.html.erb index 185697801..5c84e8d94 100644 --- a/app/views/content_items/service_sign_in/_create_new_account.html.erb +++ b/app/views/content_items/service_sign_in/_create_new_account.html.erb @@ -3,6 +3,6 @@
<%= render 'govuk_component/title', title: @content_item.title %> - <%= render 'govuk_component/govspeak', content: @content_item.body %> + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body %>
diff --git a/app/views/content_items/specialist_document.html.erb b/app/views/content_items/specialist_document.html.erb index 45375aff2..7a78083a6 100644 --- a/app/views/content_items/specialist_document.html.erb +++ b/app/views/content_items/specialist_document.html.erb @@ -25,7 +25,7 @@ <%= render "components/contents-list-with-body", contents: @content_item.contents do %>
- <%= render 'govuk_component/govspeak', @content_item.govspeak_body %> + <%= render 'govuk_publishing_components/components/govspeak', @content_item.govspeak_body %> <% if @content_item.continuation_link %> <%= render( 'govuk_publishing_components/components/button', diff --git a/app/views/content_items/speech.html.erb b/app/views/content_items/speech.html.erb index 8dc816daa..a50832e0f 100644 --- a/app/views/content_items/speech.html.erb +++ b/app/views/content_items/speech.html.erb @@ -29,7 +29,7 @@ alt: @content_item.image["alt_text"], caption: @content_item.image["caption"] if @content_item.image %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %>
diff --git a/app/views/content_items/statistical_data_set.html.erb b/app/views/content_items/statistical_data_set.html.erb index 5d4b2b15c..d0d52e917 100644 --- a/app/views/content_items/statistical_data_set.html.erb +++ b/app/views/content_items/statistical_data_set.html.erb @@ -26,7 +26,7 @@ <%= render "components/contents-list-with-body", contents: @content_item.contents do %>
- <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %>
diff --git a/app/views/content_items/take_part.html.erb b/app/views/content_items/take_part.html.erb index d7413f5c2..ae82dc927 100644 --- a/app/views/content_items/take_part.html.erb +++ b/app/views/content_items/take_part.html.erb @@ -20,7 +20,7 @@ alt: @content_item.image["alt_text"], caption: @content_item.image["caption"] if @content_item.image %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %>
diff --git a/app/views/content_items/topical_event_about_page.html.erb b/app/views/content_items/topical_event_about_page.html.erb index c0e0db997..ae37a946f 100644 --- a/app/views/content_items/topical_event_about_page.html.erb +++ b/app/views/content_items/topical_event_about_page.html.erb @@ -17,7 +17,7 @@ <%= render "components/contents-list-with-body", { contents: @content_item.contents, } do %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %> <% end %> diff --git a/app/views/content_items/travel_advice.html+print.erb b/app/views/content_items/travel_advice.html+print.erb index 8aacbcd1b..9cdf49f50 100644 --- a/app/views/content_items/travel_advice.html+print.erb +++ b/app/views/content_items/travel_advice.html+print.erb @@ -17,7 +17,7 @@ <%= render 'shared/travel_advice_summary', content_item: @content_item if i == 0 %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: part['body'], direction: page_text_direction %> diff --git a/app/views/content_items/travel_advice.html.erb b/app/views/content_items/travel_advice.html.erb index ea04fd8e5..6999e1434 100644 --- a/app/views/content_items/travel_advice.html.erb +++ b/app/views/content_items/travel_advice.html.erb @@ -50,7 +50,7 @@ <%= render 'shared/travel_advice_summary', content_item: @content_item %> <% end %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.current_part_body, direction: page_text_direction %> diff --git a/app/views/content_items/unpublishing.html.erb b/app/views/content_items/unpublishing.html.erb index afce9bb95..7aa04cc10 100644 --- a/app/views/content_items/unpublishing.html.erb +++ b/app/views/content_items/unpublishing.html.erb @@ -6,7 +6,7 @@ The information on this page has been removed because it was published in error.

- <%= render 'govuk_component/govspeak', content: @content_item.explanation %> + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.explanation %> <% if @content_item.alternative_url.present? %>

diff --git a/app/views/content_items/working_group.html.erb b/app/views/content_items/working_group.html.erb index 3c53a558a..bbf10145f 100644 --- a/app/views/content_items/working_group.html.erb +++ b/app/views/content_items/working_group.html.erb @@ -28,7 +28,7 @@

<%= render 'govuk_publishing_components/components/lead_paragraph', text: @content_item.description %> <%= render 'components/contents-list-with-body', contents: @content_item.contents do %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: "#{@content_item.body} #{@additional_body}", direction: page_text_direction %> <% end %> diff --git a/app/views/content_items/world_location_news_article.html.erb b/app/views/content_items/world_location_news_article.html.erb index 4f55c99c8..8f65c24a6 100644 --- a/app/views/content_items/world_location_news_article.html.erb +++ b/app/views/content_items/world_location_news_article.html.erb @@ -26,7 +26,7 @@ alt: @content_item.image["alt_text"], caption: @content_item.image["caption"] if @content_item.image %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: @content_item.body, direction: page_text_direction %>
diff --git a/app/views/development/index.html.erb b/app/views/development/index.html.erb index 085f37c9f..4cdf55833 100644 --- a/app/views/development/index.html.erb +++ b/app/views/development/index.html.erb @@ -88,7 +88,7 @@ <% end %> - <%= render 'govuk_component/govspeak', content: html %> + <%= render 'govuk_publishing_components/components/govspeak', content: html %>
diff --git a/app/views/shared/_travel_advice_summary.html.erb b/app/views/shared/_travel_advice_summary.html.erb index 6d51ae623..a0c6d401d 100644 --- a/app/views/shared/_travel_advice_summary.html.erb +++ b/app/views/shared/_travel_advice_summary.html.erb @@ -4,7 +4,7 @@ <%= content_item.alert_status %>
<% end %> - <%= render 'govuk_component/govspeak', + <%= render 'govuk_publishing_components/components/govspeak', content: alert_body, direction: page_text_direction %> <% end %> From 2e3adf6b049ed3df289b46ac6a3459210f282434 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Mon, 4 Jun 2018 13:56:32 +0000 Subject: [PATCH 5/6] Test using govspeak from gem - update assert_has_component_govspeak to be simpler, since the component is no longer coming from static in a strange format - remove within_component_govspeak method from test helper as no longer needed - update all tests that relied on these methods - amend some tests that were too specific and failing --- test/integration/answer_test.rb | 3 +- test/integration/case_study_test.rb | 2 +- test/integration/consultation_test.rb | 30 ++++------- test/integration/contact_test.rb | 54 +++++++------------ .../corporate_information_page_test.rb | 25 +++------ test/integration/detailed_guide_test.rb | 8 ++- test/integration/document_collection_test.rb | 6 +-- test/integration/fatality_notice_test.rb | 6 +-- test/integration/help_page_test.rb | 2 +- test/integration/html_publication_test.rb | 4 +- test/integration/news_article_test.rb | 2 +- test/integration/publication_test.rb | 6 +-- .../service_sign_in/choose_sign_in_test.rb | 45 ++++++---------- .../create_new_account_test.rb | 3 +- test/integration/specialist_document_test.rb | 4 +- test/integration/speech_test.rb | 2 +- test/integration/statistical_data_set_test.rb | 5 +- test/integration/take_part_test.rb | 2 +- .../topical_event_about_page_test.rb | 2 +- test/integration/travel_advice_test.rb | 4 +- test/integration/working_group_test.rb | 13 ++--- .../world_location_news_article_test.rb | 2 +- test/test_helper.rb | 11 +--- 23 files changed, 85 insertions(+), 156 deletions(-) diff --git a/test/integration/answer_test.rb b/test/integration/answer_test.rb index 3f99760f8..8b52ba926 100644 --- a/test/integration/answer_test.rb +++ b/test/integration/answer_test.rb @@ -8,8 +8,7 @@ class AnswerTest < ActionDispatch::IntegrationTest test "renders title and body" do setup_and_visit_content_item('answer') assert page.has_text?(@content_item["title"]) - assert_has_component_govspeak(@content_item["details"]["body"]) - # assert page.has_text?("Diweddarwyd diwethaf: 28 Mai 2015") + assert_has_component_govspeak("Bydd angen cod cychwyn arnoch i ddechrau defnyddio’r holl wasanaethau hyn, ac eithrio TAW. Anfonir hwn atoch cyn pen saith diwrnod gwaith ar ôl i chi gofrestru. Os ydych chi’n byw dramor, gall gymryd hyd at 21 diwrnod i gyrraedd.") end test "related links are rendered" do diff --git a/test/integration/case_study_test.rb b/test/integration/case_study_test.rb index d242755a8..b1284aa40 100644 --- a/test/integration/case_study_test.rb +++ b/test/integration/case_study_test.rb @@ -22,7 +22,7 @@ class CaseStudyTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert page.has_text?('This case study was withdrawn'), "is withdrawn" - assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) + assert_has_component_govspeak("We’ve withdrawn this case study and published newer") assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") end end diff --git a/test/integration/consultation_test.rb b/test/integration/consultation_test.rb index a3a329c86..f92965ff7 100644 --- a/test/integration/consultation_test.rb +++ b/test/integration/consultation_test.rb @@ -18,7 +18,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest assert_footer_has_published_dates("Published 4 November 2016", "Last updated 7 November 2016") within '.consultation-description' do - assert_has_component_govspeak(@content_item["details"]["body"]) + assert page.has_text?("We are seeking external views on a postgraduate doctoral loan.") end end @@ -26,7 +26,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('closed_consultation') within '.consultation-documents' do - assert_has_component_govspeak(@content_item["details"]["documents"].join('')) + assert page.has_text?("Museums Review Terms of Reference") end end @@ -83,7 +83,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest assert page.has_text?("Detail of feedback received") within '.consultation-feedback' do - assert_has_component_govspeak(@content_item["details"]["public_feedback_detail"]) + assert page.has_text?("The majority of respondents agreed or strongly agreed with our proposals, which were:") end end @@ -91,7 +91,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('consultation_outcome') within '.consultation-outcome' do - assert_has_component_govspeak(@content_item["details"]["final_outcome_documents"].join('')) + assert page.has_text?("Employee Share Schemes: NIC elections - consulation response") end end @@ -100,7 +100,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest assert page.has_text?("Feedback received") within '.consultation-feedback-documents' do - assert_has_component_govspeak(@content_item["details"]["public_feedback_documents"].join('')) + assert page.has_text?("Analysis of responses to our consultation on setting the grade standards of new GCSEs in England – part 2") end end @@ -114,14 +114,10 @@ class ConsultationTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('open_consultation_with_participation') within '.consultation-ways-to-respond' do - within_component_govspeak do |component_args| - content = component_args.fetch("content") - html = Nokogiri::HTML.parse(content) - assert html.at_css(".call-to-action a[href='https://beisgovuk.citizenspace.com/ukgi/post-office-network-consultation']", text: 'Respond online') - assert html.at_css("a[href='mailto:po.consultation@ukgi.gov.uk']", text: 'po.consultation@ukgi.gov.uk') - assert html.at_css(".contact", text: '2016 Post Office Network Consultation') - assert html.at_css("a[href='https://www.gov.uk/government/uploads/system/uploads/consultation_response_form_data/file/533/beis-16-36rf-post-office-network-consultation-response-form.docx']", text: 'response form') - end + assert page.has_css?(".call-to-action a[href='https://beisgovuk.citizenspace.com/ukgi/post-office-network-consultation']", text: 'Respond online') + assert page.has_css?("a[href='mailto:po.consultation@ukgi.gov.uk']", text: 'po.consultation@ukgi.gov.uk') + assert page.has_css?(".contact", text: '2016 Post Office Network Consultation') + assert page.has_css?("a[href='https://www.gov.uk/government/uploads/system/uploads/consultation_response_form_data/file/533/beis-16-36rf-post-office-network-consultation-response-form.docx']", text: 'response form') end end @@ -129,12 +125,8 @@ class ConsultationTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('open_consultation_with_participation') within '.consultation-ways-to-respond' do - within_component_govspeak do |component_args| - content = component_args.fetch("content") - html = Nokogiri::HTML.parse(content) - assert html.at_css(".contact .content p", text: '2016 Post Office Network Consultation') - assert html.at_css(".contact .content p br") - end + assert page.has_css?(".contact .content p", text: '2016 Post Office Network Consultation') + assert page.has_css?(".contact .content p br") end end diff --git a/test/integration/contact_test.rb b/test/integration/contact_test.rb index 9ae2ff94c..f35c0d3ce 100644 --- a/test/integration/contact_test.rb +++ b/test/integration/contact_test.rb @@ -7,63 +7,45 @@ class ContactTest < ActionDispatch::IntegrationTest test "online forms are rendered" do setup_and_visit_content_item('contact') - within_component_govspeak do |component_args| - content = component_args.fetch("content") - assert content.include? @content_item["details"]["more_info_contact_form"] - first_contact_form_link = @content_item["details"]["contact_form_links"].first + assert_has_component_govspeak("If HMRC needs to contact you about anything confidential they’ll reply by phone or post.") + assert_has_component_govspeak("Contact HMRC to report suspicious activity in relation to smuggling, customs, excise and VAT fraud.") - assert content.include? first_contact_form_link['description'] - - html = Nokogiri::HTML.parse(content) - assert_not_nil html.at_css("h2#online-forms-title") - assert_not_nil html.at_css("a[href='#{first_contact_form_link['link']}']") - end + assert page.has_css?("h2#online-forms-title") + first_contact_form_link = @content_item["details"]["contact_form_links"].first + assert page.has_css?("a[href='#{first_contact_form_link['link']}']") end test "emails are rendered" do setup_and_visit_content_item('contact') - within_component_govspeak do |component_args| - content = component_args.fetch("content") - html = Nokogiri::HTML.parse(content) - assert_not_nil html.at_css("h2#email-title") - assert_not_nil html.at_css(".email:first-of-type") - end + assert page.has_css?("h2#email-title") + assert page.has_css?(".email:first-of-type") end test "phones are rendered" do setup_and_visit_content_item('contact') - within_component_govspeak do |component_args| - first_phone = @content_item["details"]["phone_numbers"].first - html = Nokogiri::HTML.parse(component_args.fetch("content")) - assert_not_nil html.at_css("h2#phone-title") - assert_not_nil html.at("h3:contains(\"#{first_phone['title']}\")") - assert_not_nil html.at("p:contains(\"#{first_phone['number']}\")") - assert_not_nil html.at("p:contains(\"24 hours a day, 7 days a week\")") - end + first_phone = @content_item["details"]["phone_numbers"].first + + assert page.has_css?("h2#phone-title") + assert page.has_css?("h3", text: first_phone['title']) + assert page.has_css?("p", text: first_phone['number']) + assert page.has_css?("p", text: "24 hours a day, 7 days a week") end test "phone number heading is not rendered when only one number" do setup_and_visit_content_item('contact_with_welsh') - within_component_govspeak do |component_args| - first_phone = @content_item["details"]["phone_numbers"].first - html = Nokogiri::HTML.parse(component_args.fetch("content")) - assert_equal 1, @content_item["details"]["phone_numbers"].size - refute html.at("h3:contains(\"#{first_phone['title']}\")") - end + assert_equal 1, @content_item["details"]["phone_numbers"].size + first_phone = @content_item["details"]["phone_numbers"].first + refute page.has_css?("h3", text: first_phone['title']) end test "posts are rendered" do setup_and_visit_content_item('contact') - within_component_govspeak do |component_args| - content = component_args.fetch("content") - html = Nokogiri::HTML.parse(content) - assert_not_nil html.at_css("h2#post-title") - assert_not_nil html.at_css(".street-address") - end + assert page.has_css?("h2#post-title") + assert page.has_css?(".street-address") end end diff --git a/test/integration/corporate_information_page_test.rb b/test/integration/corporate_information_page_test.rb index 6b2e7cfb5..c236133fa 100644 --- a/test/integration/corporate_information_page_test.rb +++ b/test/integration/corporate_information_page_test.rb @@ -6,7 +6,7 @@ class CorporateInformationPageTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert page.has_text?("Ni all y Gofrestrfa Tir drafod achosion unigol ar ein sianeli cyfryngau cymdeithasol. Ni fyddwn yn gofyn i chi ddatgelu gwybodaeth bersonol na thalu trwy Twitter, Facebook, LinkedIn nac ebost. Os cewch neges o’r fath, peidiwch ag ymateb – nid yw gan y Gofrestrfa Tir a gall fod yn faleisus.") end test "renders with contents list" do @@ -33,28 +33,19 @@ class CorporateInformationPageTest < ActionDispatch::IntegrationTest test "renders corporate information with body when present" do setup_and_visit_content_item('corporate_information_page') - within_component_govspeak do |component_args| - content = component_args.fetch("content") - assert content.gsub(/\s+/, ' ').include? @content_item["details"]["body"].gsub(/\s+/, ' ') + assert page.has_css?("h2#corporate-information") + assert page.has_css?("h3#access-our-information") + assert page.has_css?("h3#jobs-and-contracts") - html = Nokogiri::HTML.parse(content) - assert_not_nil html.at_css("h2#corporate-information") - assert_not_nil html.at_css("h3#access-our-information") - assert_not_nil html.at_css("h3#jobs-and-contracts") - - assert_not_nil html.at_css("ul li a[href='/government/organisations/department-of-health/about/complaints-procedure']") - assert_not_nil html.at_css("ul li a[href*='/government/publications']") - assert_not_nil html.at_css("ul li a[href='https://www.civilservicejobs.service.gov.uk/csr']") - end + assert page.has_css?("ul li a[href='/government/organisations/department-of-health/about/complaints-procedure']") + assert page.has_css?("ul li a[href*='/government/publications']") + assert page.has_css?("ul li a[href='https://www.civilservicejobs.service.gov.uk/csr']") end test "renders further information with body when present" do setup_and_visit_content_item('corporate_information_page') - within_component_govspeak do |component_args| - content = component_args.fetch("content") - assert content.gsub(/\s+/, ' ').include? "Read about the types of information we routinely" - end + assert page.has_text?("Read about the types of information we routinely") end test "renders with organisation branding" do diff --git a/test/integration/detailed_guide_test.rb b/test/integration/detailed_guide_test.rb index f77ef8138..980e245a0 100644 --- a/test/integration/detailed_guide_test.rb +++ b/test/integration/detailed_guide_test.rb @@ -34,11 +34,9 @@ class DetailedGuideTest < ActionDispatch::IntegrationTest assert page.has_css?('title', text: "[Withdrawn]", visible: false) - within ".gem-c-notice" do - assert page.has_text?('This guidance was withdrawn'), "is withdrawn" - assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) - assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") - end + assert page.has_text?('This guidance was withdrawn'), "is withdrawn" + assert_has_component_govspeak("This information has been archived as it is now out of date. For current information please go to") + assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") end test "historically political detailed guide" do diff --git a/test/integration/document_collection_test.rb b/test/integration/document_collection_test.rb index 224e4d758..f612cf6dc 100644 --- a/test/integration/document_collection_test.rb +++ b/test/integration/document_collection_test.rb @@ -34,7 +34,7 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest test "renders body when provided" do setup_and_visit_content_item('document_collection_with_body') - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("Each regime page provides a current list of asset freeze targets designated by the United Nations (UN), European Union and United Kingdom, under legislation relating to current financial sanctions regimes.") end test "renders contents with link to each collection group" do @@ -69,7 +69,7 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest end within ".app-c-contents-list-with-body" do - assert page.has_css?(shared_component_selector("govspeak"), count: group_count) + assert page.has_css?(".gem-c-govspeak", count: group_count) assert page.has_css?('.gem-c-document-list', count: group_count) end end @@ -144,7 +144,7 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert page.has_text?('This collection was withdrawn'), "is withdrawn" - assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) + assert_has_component_govspeak("This information is now out of date.") assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") end end diff --git a/test/integration/fatality_notice_test.rb b/test/integration/fatality_notice_test.rb index 256950a58..6762c4827 100644 --- a/test/integration/fatality_notice_test.rb +++ b/test/integration/fatality_notice_test.rb @@ -40,6 +40,8 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest 'should have image with ministry-of-defence source with alt text' ) + assert_has_component_govspeak("Colley served nearly all of his military and administrative career in British South Africa, but he played a significant part in the Second Anglo-Afghan War as military secretary and then private secretary to the governor-general of India, Lord Lytton. The war began in November 1878 and ended in May 1879 with the Treaty of Gandamak.") + within(".content-bottom-margin .app-c-published-dates") do assert page.has_content?("Published 27 February 1881") assert page.has_content?("Last updated 14 September 2016") @@ -77,9 +79,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert_text("This fatality notice was withdrawn on 14 September 2016") - assert_has_component_govspeak( - "

This content is not factually correct. For current information please go to https://en.wikipedia.org/wiki/George_Pomeroy_Colley

" - ) + assert_has_component_govspeak("This content is not factually correct. For current information please go to") end end end diff --git a/test/integration/help_page_test.rb b/test/integration/help_page_test.rb index 131286df4..15806574e 100644 --- a/test/integration/help_page_test.rb +++ b/test/integration/help_page_test.rb @@ -5,7 +5,7 @@ class HelpPageTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('help_page') assert page.has_text?(@content_item["title"]) - assert_has_component_govspeak(@content_item["details"]["body"].squish) + assert_has_component_govspeak("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 end diff --git a/test/integration/html_publication_test.rb b/test/integration/html_publication_test.rb index 6ece184b2..6cafc40aa 100644 --- a/test/integration/html_publication_test.rb +++ b/test/integration/html_publication_test.rb @@ -78,9 +78,7 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest end def assert_has_component_govspeak_html_publication(content) - within shared_component_selector("govspeak_html_publication") do - assert_equal content, JSON.parse(page.text).fetch("content") - end + assert_has_component_govspeak("The Environment Agency will normally put any responses it receives on the public register. This includes your name and contact details. Tell us if you don’t want your response to be public.") end def assert_has_component_organisation_logo_with_brand(brand, index = 1) diff --git a/test/integration/news_article_test.rb b/test/integration/news_article_test.rb index d802ba1ed..1688b15f5 100644 --- a/test/integration/news_article_test.rb +++ b/test/integration/news_article_test.rb @@ -6,7 +6,7 @@ class NewsArticleTest < ActionDispatch::IntegrationTest assert_has_component_government_navigation_active("announcements") assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert page.has_text?("This year, the United Kingdom has had much to celebrate. Her Majesty The Queen celebrated her 90th birthday") end test "renders first published and from in metadata and document footer" do diff --git a/test/integration/publication_test.rb b/test/integration/publication_test.rb index 836101e39..09a122c85 100644 --- a/test/integration/publication_test.rb +++ b/test/integration/publication_test.rb @@ -12,7 +12,7 @@ class PublicationTest < ActionDispatch::IntegrationTest assert page.has_text?(@content_item["description"]) within '[aria-labelledby="details-title"]' do - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("Installation name: Leeming Biogas Facility") end end @@ -35,7 +35,7 @@ class PublicationTest < ActionDispatch::IntegrationTest test "renders a govspeak block for attachments" do setup_and_visit_content_item('publication') within '[aria-labelledby="documents-title"]' do - assert_has_component_govspeak(@content_item["details"]["documents"].join('')) + assert_has_component_govspeak("Permit: Veolia ES (UK) Limited") end end @@ -45,7 +45,7 @@ class PublicationTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert page.has_text?('This publication was withdrawn'), "is withdrawn" - assert_has_component_govspeak(@content_item["withdrawn_notice"]["explanation"]) + assert_has_component_govspeak("guidance for keepers of sheep, goats and pigs") assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") 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 1715084e7..04d62c5a9 100644 --- a/test/integration/service_sign_in/choose_sign_in_test.rb +++ b/test/integration/service_sign_in/choose_sign_in_test.rb @@ -30,26 +30,21 @@ class ChooseSignInTest < ActionDispatch::IntegrationTest end end - within shared_component_selector('govspeak') do + within ".gem-c-govspeak" do assert page.has_text?("You can't file online until you've activated Government Gateway account using your Unique Taxpayer Reference(UTR).") end - within ".gem-c-radio:first-of-type" do - assert page.has_css?(".gem-c-radio__label__text", text: "Use Government Gateway") - assert page.has_css?(".gem-c-radio__label__hint", text: "You’ll have a user ID if you’ve signed up to do things like file your Self Assessment tax return online.") - end + assert page.has_css?(".gem-c-radio__label__text", text: "Use Government Gateway") + assert page.has_css?(".gem-c-radio__label__hint", text: "You’ll have a user ID if you’ve signed up to do things like file your Self Assessment tax return online.") - within ".gem-c-radio:nth-of-type(2)" do - assert page.has_css?(".gem-c-radio__label__text", text: "Use GOV.UK Verify") - assert page.has_css?(".gem-c-radio__label__hint", text: "You’ll have an account if you’ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.") - end + assert page.has_css?(".gem-c-radio__label__text", text: "Use GOV.UK Verify") + assert page.has_css?(".gem-c-radio__label__hint", text: "You’ll have an account if you’ve already proved your identity with either Barclays, CitizenSafe, Digidentity, Experian, Post Office, Royal Mail or SecureIdentity.") assert page.has_css?(".gem-c-radio__block-text", text: "or") - within ".gem-c-radio:last-of-type" do - assert page.has_css?(".gem-c-radio__label__text", text: "Create an account") - end + assert page.has_css?(".gem-c-radio__label__text", text: "Create an account") end + assert page.has_css?(".gem-c-button", text: "Continue") end end @@ -72,15 +67,11 @@ class ChooseSignInTest < ActionDispatch::IntegrationTest test "page less options without an or divider" do setup_and_visit_choose_sign_in_page("view_driving_licence", "/choose-sign-in") - within ".gem-c-radio:first-of-type" do - assert page.has_css?(".gem-c-radio__label__text", text: "Use your driving licence and National Insurance number") - assert page.has_css?(".gem-c-radio__label__hint", text: "Your driving licence must have been issued in England, Scotland or Wales.") - end + assert page.has_css?(".gem-c-radio__label__text", text: "Use your driving licence and National Insurance number") + assert page.has_css?(".gem-c-radio__label__hint", text: "Your driving licence must have been issued in England, Scotland or Wales.") - within ".gem-c-radio:last-of-type" do - assert page.has_css?(".gem-c-radio__label__text", text: "Use GOV.UK Verify") - assert page.has_css?(".gem-c-radio__label__hint", text: "You can use an existing identity account or create a new one. It usually takes about 5 minutes to create an account.") - end + assert page.has_css?(".gem-c-radio__label__text", text: "Use GOV.UK Verify") + assert page.has_css?(".gem-c-radio__label__hint", text: "You can use an existing identity account or create a new one. It usually takes about 5 minutes to create an account.") refute page.has_css?(".gem-c-radio__block-text", text: "or") end @@ -99,19 +90,15 @@ class ChooseSignInTest < ActionDispatch::IntegrationTest end end - within shared_component_selector('govspeak') do + within ".gem-c-govspeak" do assert page.has_text?("Os ydych chi’n ffeilio ar-lein am y tro cyntaf, bydd angen i chi gofrestru ar gyfer Hunanasesiad yn gyntaf.") end - within ".gem-c-radio:first-of-type" do - assert page.has_css?(".gem-c-radio__label__text", text: "Defnyddio Porth y Llywodraeth") - assert page.has_css?(".gem-c-radio__label__hint", text: "Bydd gennych chi ID defnyddiwr os ydych chi wedi cofrestru ar gyfer Hunanasesiad neu wedi ffeilio ffurflen dreth ar-lein yn y gorffennol.") - end + assert page.has_css?(".gem-c-radio__label__text", text: "Defnyddio Porth y Llywodraeth") + assert page.has_css?(".gem-c-radio__label__hint", text: "Bydd gennych chi ID defnyddiwr os ydych chi wedi cofrestru ar gyfer Hunanasesiad neu wedi ffeilio ffurflen dreth ar-lein yn y gorffennol.") - within ".gem-c-radio:nth-of-type(2)" do - assert page.has_css?(".gem-c-radio__label__text", text: "Defnyddio GOV.UK Verify") - assert page.has_css?(".gem-c-radio__label__hint", text: "Bydd gennych chi gyfrif os ydych chi wedi profi'n barod pwy ydych chi naill ai gyda Barclays, CitizenSafe, Digidentity, Experian, Swyddfa'r Post, y Post Brenhinol neu SecureIdentity.") - end + assert page.has_css?(".gem-c-radio__label__text", text: "Defnyddio GOV.UK Verify") + assert page.has_css?(".gem-c-radio__label__hint", text: "Bydd gennych chi gyfrif os ydych chi wedi profi'n barod pwy ydych chi naill ai gyda Barclays, CitizenSafe, Digidentity, Experian, Swyddfa'r Post, y Post Brenhinol neu SecureIdentity.") assert page.has_css?(".gem-c-radio__block-text", text: "neu") 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 67b12fc77..17d29b7b4 100644 --- a/test/integration/service_sign_in/create_new_account_test.rb +++ b/test/integration/service_sign_in/create_new_account_test.rb @@ -25,8 +25,7 @@ class CreateNewAccount < ActionDispatch::IntegrationTest assert page.has_text?("Create an account") end - 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_text?("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.") assert page.has_css?('meta[name="robots"][content="noindex, nofollow"]', visible: false) refute page.has_css?(shared_component_selector('government_navigation')) diff --git a/test/integration/specialist_document_test.rb b/test/integration/specialist_document_test.rb index aca4e0e95..6f450c782 100644 --- a/test/integration/specialist_document_test.rb +++ b/test/integration/specialist_document_test.rb @@ -32,7 +32,7 @@ class SpecialistDocumentTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("The gyroplane began to move forward against the brakes before sufficient rotor rpm had been achieved for takeoff.") end test "returns example for residential tribunal decision" do @@ -40,7 +40,7 @@ class SpecialistDocumentTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.") end test "renders from in publisher metadata" do diff --git a/test/integration/speech_test.rb b/test/integration/speech_test.rb index 778cb8c15..f54ef096a 100644 --- a/test/integration/speech_test.rb +++ b/test/integration/speech_test.rb @@ -6,7 +6,7 @@ class SpeechTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("These subjects are of course crucial. But in the UK, only 1 woman to every 7 men works in science, technology, engineering and maths. We need to get more girls interested and excited about STEM subjects.") end test "translated speech" do diff --git a/test/integration/statistical_data_set_test.rb b/test/integration/statistical_data_set_test.rb index 69cfeb213..a6f5f1660 100644 --- a/test/integration/statistical_data_set_test.rb +++ b/test/integration/statistical_data_set_test.rb @@ -6,7 +6,7 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("This is not intended to be a comprehensive review of transport performance in London or Great Britain during the Games, but supplements evidence from other sources.") end test "renders metadata and document footer" do @@ -25,12 +25,11 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest assert page.has_css?('title', text: "[Withdrawn]", visible: false) - withdrawn_notice_explanation = @content_item["withdrawn_notice"]["explanation"] withdrawn_at = @content_item["withdrawn_notice"]["withdrawn_at"] within ".gem-c-notice" do assert page.has_text?("This statistical data set was withdrawn"), "is withdrawn" - assert_has_component_govspeak(withdrawn_notice_explanation) + assert_has_component_govspeak("Local area walking and cycling in England: 2014 to 2015") assert page.has_css?("time[datetime='#{withdrawn_at}']") end end diff --git a/test/integration/take_part_test.rb b/test/integration/take_part_test.rb index de38b070c..09a04958d 100644 --- a/test/integration/take_part_test.rb +++ b/test/integration/take_part_test.rb @@ -7,6 +7,6 @@ class TakePartTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("There are roughly 20,000 local councillors in England. Councillors are elected to the local council to represent their own local community, so they must either live or work in the area.") end end diff --git a/test/integration/topical_event_about_page_test.rb b/test/integration/topical_event_about_page_test.rb index 0676d76a2..31da2ee9f 100644 --- a/test/integration/topical_event_about_page_test.rb +++ b/test/integration/topical_event_about_page_test.rb @@ -9,7 +9,7 @@ class TopicalEventAboutPageTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('topical_event_about_page') assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("The risk of Ebola to the UK remains low. The virus is only transmitted by direct contact with the blood or bodily fluids of an infected person.") assert_has_contents_list([ { text: "Response in the UK", id: "response-in-the-uk" }, { text: "Response in Africa", id: "response-in-africa" }, diff --git a/test/integration/travel_advice_test.rb b/test/integration/travel_advice_test.rb index fa5dfb669..f9bd2c7e8 100644 --- a/test/integration/travel_advice_test.rb +++ b/test/integration/travel_advice_test.rb @@ -31,7 +31,7 @@ class TravelAdviceTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('full-country') assert page.has_css?("h1", text: "Summary") - assert_has_component_govspeak(@content_item["details"]["summary"]) + assert_has_component_govspeak("The main opposition party has called for mass protests against the government in Tirana on 18 February 2017. The political atmosphere is likely to become changeable as the country approaches national elections on 18 June 2017.") assert_has_component_metadata_pair("Still current at", Date.today.strftime("%-d %B %Y")) assert_has_component_metadata_pair("Updated", Date.parse(@content_item["details"]["reviewed_at"]).strftime("%-d %B %Y")) @@ -55,7 +55,7 @@ class TravelAdviceTest < ActionDispatch::IntegrationTest assert page.has_css?("title", visible: false, text: "#{first_part['title']} - #{@content_item['title']}") assert page.has_css?("h1", text: first_part['title']) - assert_has_component_govspeak(first_part['body']) + assert_has_component_govspeak("Public security is generally good, particularly in Tirana, and Albanians are very hospitable to visitors.") refute page.has_css?(".map") refute page.has_css?(shared_component_selector("metadata")) diff --git a/test/integration/working_group_test.rb b/test/integration/working_group_test.rb index 4f28139ff..1dc14530b 100644 --- a/test/integration/working_group_test.rb +++ b/test/integration/working_group_test.rb @@ -18,13 +18,9 @@ class WorkingGroupTest < ActionDispatch::IntegrationTest { text: "Meeting Minutes", id: "meeting-minutes" }, { text: "Contact details", id: "contact-details" }, ]) - within_component_govspeak do |component_args| - content = component_args.fetch("content") - assert content.include? @content_item["details"]["body"] - html = Nokogiri::HTML.parse(content) - assert_not_nil html.at_css("h2#contact-details") - end + assert page.has_text?("Benefits and Credits Consultation Group meeting 28 May 2014") + assert page.has_css?("h2#contact-details") end test "with_policies" do @@ -34,10 +30,7 @@ class WorkingGroupTest < ActionDispatch::IntegrationTest assert page.has_text?("Policies") assert page.has_text?(policy["title"]) - within_component_govspeak do |component_args| - html = Nokogiri::HTML.parse(component_args.fetch("content")) - assert_not_nil html.at_css("h2#policies") - end + assert page.has_css?("h2#policies") end test "with a body that has no h2s" do diff --git a/test/integration/world_location_news_article_test.rb b/test/integration/world_location_news_article_test.rb index 3f1b56cf1..2f297370d 100644 --- a/test/integration/world_location_news_article_test.rb +++ b/test/integration/world_location_news_article_test.rb @@ -11,7 +11,7 @@ class WorldLocationNewsArticleTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak(@content_item["details"]["body"]) + assert_has_component_govspeak("As with the core Chevening Scheme this fellowship is an open competition. Applications from eligible countries will be assessed against each other by an independent panel and the top application for each topic received will be awarded.") end test "renders first published, from and part of in metadata and document footer" do diff --git a/test/test_helper.rb b/test/test_helper.rb index e72093033..20991b5b1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -84,16 +84,7 @@ def assert_has_component_title(title) end def assert_has_component_govspeak(content) - within_component_govspeak do - assert_equal content.squish, JSON.parse(page.text).fetch("content").squish - end - end - - def within_component_govspeak - within(shared_component_selector("govspeak")) do - component_args = JSON.parse(page.text) - yield component_args - end + assert page.has_text?(content.squish) end def assert_has_component_organisation_logo(logo, index = 1) From 3cafef219196157fdbb136be09ca60adc8d23956 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Mon, 4 Jun 2018 14:07:15 +0000 Subject: [PATCH 6/6] Remove assert_has_component_govspeak method - since it's now just has_text, no need for it to be a separate method - update tests --- test/integration/answer_test.rb | 2 +- test/integration/case_study_test.rb | 2 +- test/integration/consultation_test.rb | 2 +- test/integration/contact_test.rb | 4 ++-- test/integration/detailed_guide_test.rb | 2 +- test/integration/document_collection_test.rb | 4 ++-- test/integration/fatality_notice_test.rb | 4 ++-- test/integration/help_page_test.rb | 2 +- test/integration/html_publication_test.rb | 6 +----- test/integration/publication_test.rb | 6 +++--- test/integration/specialist_document_test.rb | 4 ++-- test/integration/speech_test.rb | 2 +- test/integration/statistical_data_set_test.rb | 4 ++-- test/integration/take_part_test.rb | 2 +- test/integration/topical_event_about_page_test.rb | 2 +- test/integration/travel_advice_test.rb | 4 ++-- test/integration/world_location_news_article_test.rb | 2 +- test/test_helper.rb | 4 ---- 18 files changed, 25 insertions(+), 33 deletions(-) diff --git a/test/integration/answer_test.rb b/test/integration/answer_test.rb index 8b52ba926..ad7cab73b 100644 --- a/test/integration/answer_test.rb +++ b/test/integration/answer_test.rb @@ -8,7 +8,7 @@ class AnswerTest < ActionDispatch::IntegrationTest test "renders title and body" do setup_and_visit_content_item('answer') assert page.has_text?(@content_item["title"]) - assert_has_component_govspeak("Bydd angen cod cychwyn arnoch i ddechrau defnyddio’r holl wasanaethau hyn, ac eithrio TAW. Anfonir hwn atoch cyn pen saith diwrnod gwaith ar ôl i chi gofrestru. Os ydych chi’n byw dramor, gall gymryd hyd at 21 diwrnod i gyrraedd.") + assert page.has_text?("Bydd angen cod cychwyn arnoch i ddechrau defnyddio’r holl wasanaethau hyn, ac eithrio TAW. Anfonir hwn atoch cyn pen saith diwrnod gwaith ar ôl i chi gofrestru. Os ydych chi’n byw dramor, gall gymryd hyd at 21 diwrnod i gyrraedd.") end test "related links are rendered" do diff --git a/test/integration/case_study_test.rb b/test/integration/case_study_test.rb index b1284aa40..f929aa5d5 100644 --- a/test/integration/case_study_test.rb +++ b/test/integration/case_study_test.rb @@ -22,7 +22,7 @@ class CaseStudyTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert page.has_text?('This case study was withdrawn'), "is withdrawn" - assert_has_component_govspeak("We’ve withdrawn this case study and published newer") + assert page.has_text?("We’ve withdrawn this case study and published newer") assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") end end diff --git a/test/integration/consultation_test.rb b/test/integration/consultation_test.rb index f92965ff7..548faf25a 100644 --- a/test/integration/consultation_test.rb +++ b/test/integration/consultation_test.rb @@ -74,7 +74,7 @@ class ConsultationTest < ActionDispatch::IntegrationTest assert page.has_text?("4pm on 20 April 2016 to 10:45pm on 13 July 2016") within '.consultation-outcome-detail' do - assert_has_component_govspeak(@content_item["details"]["final_outcome_detail"]) + assert page.has_text?(@content_item["details"]["final_outcome_detail"]) end end diff --git a/test/integration/contact_test.rb b/test/integration/contact_test.rb index f35c0d3ce..2dde74439 100644 --- a/test/integration/contact_test.rb +++ b/test/integration/contact_test.rb @@ -8,8 +8,8 @@ class ContactTest < ActionDispatch::IntegrationTest test "online forms are rendered" do setup_and_visit_content_item('contact') - assert_has_component_govspeak("If HMRC needs to contact you about anything confidential they’ll reply by phone or post.") - assert_has_component_govspeak("Contact HMRC to report suspicious activity in relation to smuggling, customs, excise and VAT fraud.") + assert page.has_text?("If HMRC needs to contact you about anything confidential they’ll reply by phone or post.") + assert page.has_text?("Contact HMRC to report suspicious activity in relation to smuggling, customs, excise and VAT fraud.") assert page.has_css?("h2#online-forms-title") first_contact_form_link = @content_item["details"]["contact_form_links"].first diff --git a/test/integration/detailed_guide_test.rb b/test/integration/detailed_guide_test.rb index 980e245a0..5ea998988 100644 --- a/test/integration/detailed_guide_test.rb +++ b/test/integration/detailed_guide_test.rb @@ -35,7 +35,7 @@ class DetailedGuideTest < ActionDispatch::IntegrationTest assert page.has_css?('title', text: "[Withdrawn]", visible: false) assert page.has_text?('This guidance was withdrawn'), "is withdrawn" - assert_has_component_govspeak("This information has been archived as it is now out of date. For current information please go to") + assert page.has_text?("This information has been archived as it is now out of date. For current information please go to") assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") end diff --git a/test/integration/document_collection_test.rb b/test/integration/document_collection_test.rb index f612cf6dc..43e9bb991 100644 --- a/test/integration/document_collection_test.rb +++ b/test/integration/document_collection_test.rb @@ -34,7 +34,7 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest test "renders body when provided" do setup_and_visit_content_item('document_collection_with_body') - assert_has_component_govspeak("Each regime page provides a current list of asset freeze targets designated by the United Nations (UN), European Union and United Kingdom, under legislation relating to current financial sanctions regimes.") + assert page.has_text?("Each regime page provides a current list of asset freeze targets designated by the United Nations (UN), European Union and United Kingdom, under legislation relating to current financial sanctions regimes.") end test "renders contents with link to each collection group" do @@ -144,7 +144,7 @@ class DocumentCollectionTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert page.has_text?('This collection was withdrawn'), "is withdrawn" - assert_has_component_govspeak("This information is now out of date.") + assert page.has_text?("This information is now out of date.") assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") end end diff --git a/test/integration/fatality_notice_test.rb b/test/integration/fatality_notice_test.rb index 6762c4827..d7e4ff1db 100644 --- a/test/integration/fatality_notice_test.rb +++ b/test/integration/fatality_notice_test.rb @@ -40,7 +40,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest 'should have image with ministry-of-defence source with alt text' ) - assert_has_component_govspeak("Colley served nearly all of his military and administrative career in British South Africa, but he played a significant part in the Second Anglo-Afghan War as military secretary and then private secretary to the governor-general of India, Lord Lytton. The war began in November 1878 and ended in May 1879 with the Treaty of Gandamak.") + assert page.has_text?("Colley served nearly all of his military and administrative career in British South Africa, but he played a significant part in the Second Anglo-Afghan War as military secretary and then private secretary to the governor-general of India, Lord Lytton. The war began in November 1878 and ended in May 1879 with the Treaty of Gandamak.") within(".content-bottom-margin .app-c-published-dates") do assert page.has_content?("Published 27 February 1881") @@ -79,7 +79,7 @@ class FatalityNoticeTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert_text("This fatality notice was withdrawn on 14 September 2016") - assert_has_component_govspeak("This content is not factually correct. For current information please go to") + assert page.has_text?("This content is not factually correct. For current information please go to") end end end diff --git a/test/integration/help_page_test.rb b/test/integration/help_page_test.rb index 15806574e..a294f09bf 100644 --- a/test/integration/help_page_test.rb +++ b/test/integration/help_page_test.rb @@ -5,7 +5,7 @@ class HelpPageTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('help_page') assert page.has_text?(@content_item["title"]) - assert_has_component_govspeak("GOV.UK puts small files (known as ‘cookies’) onto your computer to collect information about how you browse the site.") + 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 end diff --git a/test/integration/html_publication_test.rb b/test/integration/html_publication_test.rb index 6cafc40aa..bb4c9fe18 100644 --- a/test/integration/html_publication_test.rb +++ b/test/integration/html_publication_test.rb @@ -24,7 +24,7 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest assert page.has_text?(@content_item["links"]["organisations"][0]["title"]) end - assert_has_component_govspeak_html_publication(@content_item["details"]["body"]) + assert page.has_text?("The Environment Agency will normally put any responses it receives on the public register. This includes your name and contact details. Tell us if you don’t want your response to be public.") end test "html publications with meta data" do @@ -77,10 +77,6 @@ class HtmlPublicationTest < ActionDispatch::IntegrationTest assert page.has_css?("#wrapper.direction-rtl"), "has .direction-rtl class on #wrapper element" end - def assert_has_component_govspeak_html_publication(content) - assert_has_component_govspeak("The Environment Agency will normally put any responses it receives on the public register. This includes your name and contact details. Tell us if you don’t want your response to be public.") - end - def assert_has_component_organisation_logo_with_brand(brand, index = 1) within("li.organisation-logo:nth-of-type(#{index}) #{shared_component_selector('organisation_logo')}") do assert_equal brand, JSON.parse(page.text).fetch("organisation").fetch("brand") diff --git a/test/integration/publication_test.rb b/test/integration/publication_test.rb index 09a122c85..36ead4dbe 100644 --- a/test/integration/publication_test.rb +++ b/test/integration/publication_test.rb @@ -12,7 +12,7 @@ class PublicationTest < ActionDispatch::IntegrationTest assert page.has_text?(@content_item["description"]) within '[aria-labelledby="details-title"]' do - assert_has_component_govspeak("Installation name: Leeming Biogas Facility") + assert page.has_text?("Installation name: Leeming Biogas Facility") end end @@ -35,7 +35,7 @@ class PublicationTest < ActionDispatch::IntegrationTest test "renders a govspeak block for attachments" do setup_and_visit_content_item('publication') within '[aria-labelledby="documents-title"]' do - assert_has_component_govspeak("Permit: Veolia ES (UK) Limited") + assert page.has_text?("Permit: Veolia ES (UK) Limited") end end @@ -45,7 +45,7 @@ class PublicationTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert page.has_text?('This publication was withdrawn'), "is withdrawn" - assert_has_component_govspeak("guidance for keepers of sheep, goats and pigs") + assert page.has_text?("guidance for keepers of sheep, goats and pigs") assert page.has_css?("time[datetime='#{@content_item['withdrawn_notice']['withdrawn_at']}']") end end diff --git a/test/integration/specialist_document_test.rb b/test/integration/specialist_document_test.rb index 6f450c782..268cc3676 100644 --- a/test/integration/specialist_document_test.rb +++ b/test/integration/specialist_document_test.rb @@ -32,7 +32,7 @@ class SpecialistDocumentTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak("The gyroplane began to move forward against the brakes before sufficient rotor rpm had been achieved for takeoff.") + assert page.has_text?("The gyroplane began to move forward against the brakes before sufficient rotor rpm had been achieved for takeoff.") end test "returns example for residential tribunal decision" do @@ -40,7 +40,7 @@ class SpecialistDocumentTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.") + assert page.has_text?("Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.") end test "renders from in publisher metadata" do diff --git a/test/integration/speech_test.rb b/test/integration/speech_test.rb index f54ef096a..fa3fdc719 100644 --- a/test/integration/speech_test.rb +++ b/test/integration/speech_test.rb @@ -6,7 +6,7 @@ class SpeechTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak("These subjects are of course crucial. But in the UK, only 1 woman to every 7 men works in science, technology, engineering and maths. We need to get more girls interested and excited about STEM subjects.") + assert page.has_text?("These subjects are of course crucial. But in the UK, only 1 woman to every 7 men works in science, technology, engineering and maths. We need to get more girls interested and excited about STEM subjects.") end test "translated speech" do diff --git a/test/integration/statistical_data_set_test.rb b/test/integration/statistical_data_set_test.rb index a6f5f1660..5b79a598a 100644 --- a/test/integration/statistical_data_set_test.rb +++ b/test/integration/statistical_data_set_test.rb @@ -6,7 +6,7 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak("This is not intended to be a comprehensive review of transport performance in London or Great Britain during the Games, but supplements evidence from other sources.") + assert page.has_text?("This is not intended to be a comprehensive review of transport performance in London or Great Britain during the Games, but supplements evidence from other sources.") end test "renders metadata and document footer" do @@ -29,7 +29,7 @@ class StatisticalDataSetTest < ActionDispatch::IntegrationTest within ".gem-c-notice" do assert page.has_text?("This statistical data set was withdrawn"), "is withdrawn" - assert_has_component_govspeak("Local area walking and cycling in England: 2014 to 2015") + assert page.has_text?("Local area walking and cycling in England: 2014 to 2015") assert page.has_css?("time[datetime='#{withdrawn_at}']") end end diff --git a/test/integration/take_part_test.rb b/test/integration/take_part_test.rb index 09a04958d..fb824fcb1 100644 --- a/test/integration/take_part_test.rb +++ b/test/integration/take_part_test.rb @@ -7,6 +7,6 @@ class TakePartTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak("There are roughly 20,000 local councillors in England. Councillors are elected to the local council to represent their own local community, so they must either live or work in the area.") + assert page.has_text?("There are roughly 20,000 local councillors in England. Councillors are elected to the local council to represent their own local community, so they must either live or work in the area.") end end diff --git a/test/integration/topical_event_about_page_test.rb b/test/integration/topical_event_about_page_test.rb index 31da2ee9f..269ef0fd5 100644 --- a/test/integration/topical_event_about_page_test.rb +++ b/test/integration/topical_event_about_page_test.rb @@ -9,7 +9,7 @@ class TopicalEventAboutPageTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('topical_event_about_page') assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak("The risk of Ebola to the UK remains low. The virus is only transmitted by direct contact with the blood or bodily fluids of an infected person.") + assert page.has_text?("The risk of Ebola to the UK remains low. The virus is only transmitted by direct contact with the blood or bodily fluids of an infected person.") assert_has_contents_list([ { text: "Response in the UK", id: "response-in-the-uk" }, { text: "Response in Africa", id: "response-in-africa" }, diff --git a/test/integration/travel_advice_test.rb b/test/integration/travel_advice_test.rb index f9bd2c7e8..8bf4eb45a 100644 --- a/test/integration/travel_advice_test.rb +++ b/test/integration/travel_advice_test.rb @@ -31,7 +31,7 @@ class TravelAdviceTest < ActionDispatch::IntegrationTest setup_and_visit_content_item('full-country') assert page.has_css?("h1", text: "Summary") - assert_has_component_govspeak("The main opposition party has called for mass protests against the government in Tirana on 18 February 2017. The political atmosphere is likely to become changeable as the country approaches national elections on 18 June 2017.") + assert page.has_text?("The main opposition party has called for mass protests against the government in Tirana on 18 February 2017. The political atmosphere is likely to become changeable as the country approaches national elections on 18 June 2017.") assert_has_component_metadata_pair("Still current at", Date.today.strftime("%-d %B %Y")) assert_has_component_metadata_pair("Updated", Date.parse(@content_item["details"]["reviewed_at"]).strftime("%-d %B %Y")) @@ -55,7 +55,7 @@ class TravelAdviceTest < ActionDispatch::IntegrationTest assert page.has_css?("title", visible: false, text: "#{first_part['title']} - #{@content_item['title']}") assert page.has_css?("h1", text: first_part['title']) - assert_has_component_govspeak("Public security is generally good, particularly in Tirana, and Albanians are very hospitable to visitors.") + assert page.has_text?("Public security is generally good, particularly in Tirana, and Albanians are very hospitable to visitors.") refute page.has_css?(".map") refute page.has_css?(shared_component_selector("metadata")) diff --git a/test/integration/world_location_news_article_test.rb b/test/integration/world_location_news_article_test.rb index 2f297370d..03d2177a5 100644 --- a/test/integration/world_location_news_article_test.rb +++ b/test/integration/world_location_news_article_test.rb @@ -11,7 +11,7 @@ class WorldLocationNewsArticleTest < ActionDispatch::IntegrationTest assert_has_component_title(@content_item["title"]) assert page.has_text?(@content_item["description"]) - assert_has_component_govspeak("As with the core Chevening Scheme this fellowship is an open competition. Applications from eligible countries will be assessed against each other by an independent panel and the top application for each topic received will be awarded.") + assert page.has_text?("As with the core Chevening Scheme this fellowship is an open competition. Applications from eligible countries will be assessed against each other by an independent panel and the top application for each topic received will be awarded.") end test "renders first published, from and part of in metadata and document footer" do diff --git a/test/test_helper.rb b/test/test_helper.rb index 20991b5b1..d45a6ec42 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -83,10 +83,6 @@ def assert_has_component_title(title) end end - def assert_has_component_govspeak(content) - assert page.has_text?(content.squish) - 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