Merge pull request #3074 from alphagov/remove_app_error_component

Remove app error component
alphagov · Feb 6, 2024 · fb0eeae · fb0eeae
2 parents 7fcf8bf + 4e4f628
commit fb0eeae
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 75 deletions.
diff --git a/app/assets/stylesheets/components/_error-message.scss b/app/assets/stylesheets/components/_error-message.scss
diff --git a/app/assets/stylesheets/components/helpers/_variables.scss b/app/assets/stylesheets/components/helpers/_variables.scss
diff --git a/app/views/components/_error_message.html.erb b/app/views/components/_error_message.html.erb
diff --git a/app/views/components/docs/error_message.yml b/app/views/components/docs/error_message.yml
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
@@ -23,16 +23,19 @@
              method: "post",
              data: data_attrs) do %>
   <% legend_text = render 'govuk_publishing_components/components/title', title: @content_item.title %>
+  <% description_text = render 'govuk_publishing_components/components/govspeak' do %>
+    <% raw(@content_item.description) %>
+  <% end %>
+
   <%= render "govuk_publishing_components/components/fieldset", legend_text: legend_text do %>
     <div class="govuk-grid-row">
       <div class="govuk-grid-column-two-thirds">
-        <%= render 'govuk_publishing_components/components/govspeak', {} do %>
-          <%= raw(@content_item.description) %>
-        <% end %>
-        <% if @error %>
-          <%= render "components/error_message", text: t('service_sign_in.error.option') %>
-        <% end %>
-        <%= render "govuk_publishing_components/components/radio", id_prefix: @content_item.options_id, name: "option", items: @content_item.options %>
+        <%= render "govuk_publishing_components/components/radio",
+          id_prefix: @content_item.options_id,
+          name: "option",
+          error_message: (t('service_sign_in.error.option') if @error),
+          description: description_text,
+          items: @content_item.options %>
       </div>
     </div>
   <% end %>

diff --git a/config/initializers/dartsass.rb b/config/initializers/dartsass.rb
@@ -4,7 +4,6 @@
   "components/_banner.scss" => "components/_banner.css",
   "components/_contents-list-with-body.scss" => "components/_contents-list-with-body.css",
   "components/_download-link.scss" => "components/_download-link.css",
-  "components/_error-message.scss" => "components/_error-message.css",
   "components/_figure.scss" => "components/_figure.css",
   "components/_important-metadata.scss" => "components/_important-metadata.css",
   "components/_published-dates.scss" => "components/_published-dates.css",

diff --git a/test/components/error_message_test.rb b/test/components/error_message_test.rb
diff --git a/test/integration/service_sign_in/choose_sign_in_test.rb b/test/integration/service_sign_in/choose_sign_in_test.rb
@@ -61,7 +61,7 @@ class ChooseSignInTest < ActionDispatch::IntegrationTest
       # Make sure the id is the same as the link href so that they'll link together properly.
       assert page.has_css?(".gem-c-radio input[id='option-0'][value='use-government-gateway']", visible: false)
 
-      assert page.has_css?(".app-c-error-message", text: "Please select an option")
+      assert page.has_css?(".gem-c-error-message", text: "Please select an option")
     end
 
     test "page less options without an or divider" do