Merge pull request #1276 from alphagov/make-character-count-value-req…

…uired

Make maxlength or maxwords required

CHANGELOG.md

@@ -7,6 +7,10 @@
   useful summary for people upgrading their application, not a replication
   of the commit log.
 
+## Unreleased
+
+* Make maxlength or maxwords required ([#1276](https://github.com/alphagov/govuk_publishing_components/pull/1276))
+
 ## 21.22.0
 
 * Add cookie category lookup function ([#1272](https://github.com/alphagov/govuk_publishing_components/pull/1272))

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

@@ -5,19 +5,20 @@
   threshold ||= nil
   textarea ||= {}
 %>
+<% if maxlength || maxwords %>
+  <%= content_tag :div,
+    class: "gem-c-character-count govuk-character-count",
+    data: {
+      module: "govuk-character-count",
+      maxlength: maxlength,
+      maxwords: maxwords,
+      threshold: threshold
+    } do %>
 
-<%= content_tag :div,
-  class: "gem-c-character-count govuk-character-count",
-  data: {
-    module: "govuk-character-count",
-    maxlength: maxlength,
-    maxwords: maxwords,
-    threshold: threshold
-  } do %>
+    <%= render "govuk_publishing_components/components/textarea", { id: id, character_count: true }.merge(textarea.symbolize_keys) %>
 
-  <%= render "govuk_publishing_components/components/textarea", { id: id, character_count: true }.merge(textarea.symbolize_keys) %>
-
-  <span id="<%= id %>-info" class="govuk-hint govuk-character-count__message" aria-live="polite">
-    You can enter up to <%= maxlength || maxwords %> <%= maxwords ? 'words' : 'characters' %>
-  </span>
+    <span id="<%= id %>-info" class="govuk-hint govuk-character-count__message" aria-live="polite">
+      You can enter up to <%= maxlength || maxwords %> <%= maxwords ? 'words' : 'characters' %>
+    </span>
+  <% end %>
 <% end %>

spec/components/character_count_spec.rb

@@ -5,6 +5,10 @@ def component_name
     "character_count"
   end
 
+  it "fails to render if maxlength or maxwords are not passed" do
+    assert_empty render_component({})
+  end
+
   it "renders character count with textarea" do
     render_component(
       name: "character-count",
@@ -14,8 +18,8 @@ def component_name
       },
       data: {
         module: "character-count",
-        maxlength: "100",
-      }
+      },
+      maxlength: "100"
     )
 
     assert_select ".govuk-character-count .govuk-textarea"