- <% 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/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/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 %>
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("