Merge pull request #4454 from alphagov/revert-add-the-component-wrapp…

…er-helper-to-fieldsets-2

**BREAKING** Stop setting `id` on fieldsets

CHANGELOG.md

@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## Unreleased
+
+* **BREAKING** Stop setting `id` on fieldsets ([PR #4454](https://github.com/alphagov/govuk_publishing_components/pull/4454))
+
 ## 45.10.0
 
 * Add 'toggle' module to each expandable region in metadata component ([PR #4397](https://github.com/alphagov/govuk_publishing_components/pull/4397))

app/views/govuk_publishing_components/components/_fieldset.html.erb

@@ -10,7 +10,6 @@
   heading_size = false unless shared_helper.valid_heading_size?(heading_size)
   error_message ||= nil
   error_id ||= nil
-  id ||= nil
 
   if error_message
     error_id = "error-#{SecureRandom.hex(4)}" unless error_id
@@ -27,7 +26,7 @@
   legend_classes << "govuk-fieldset__legend--#{heading_size}" if heading_size
 %>
 <%= tag.div(**component_helper.all_attributes) do %>
-  <%= tag.fieldset class: fieldset_classes, aria: { describedby: describedby }, role: role, id: id do %>
+  <%= tag.fieldset class: fieldset_classes, aria: { describedby: describedby }, role: role do %>
     <% if heading_level %>
       <%= tag.legend class: legend_classes do %>
         <%= content_tag(

app/views/govuk_publishing_components/components/docs/fieldset.yml

@@ -6,6 +6,7 @@ body: |
   You can use the `text` property or pass `text` as a block.
 accessibility_criteria: |
   - must give inputs within the fieldset context with legend text
+uses_component_wrapper_helper: true
 examples:
   default:
     data:

spec/components/fieldset_spec.rb

@@ -21,16 +21,6 @@ def component_name
     assert_select ".gem-c-fieldset", text: /Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel ad neque, maxime est ea laudantium totam fuga!/
   end
 
-  it "renders a fieldset with an id" do
-    render_component(
-      legend_text: "Do you have a passport?",
-      id: "passports",
-      text: "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel ad neque, maxime est ea laudantium totam fuga!",
-    )
-
-    assert_select ".govuk-fieldset#passports"
-  end
-
   it "renders a fieldset with the legend as heading" do
     render_component(
       legend_text: "Do you have a passport?",