Merge pull request #517 from communitiesuk/no-bullets-if-one-value

Don’t use bullet list if only one value returned

app/helpers/details_table_helper.rb

@@ -1,10 +1,12 @@
 module DetailsTableHelper
   def details_html(attribute)
-    if attribute[:format] == :bullet
+    if attribute[:format] == :bullet && attribute[:value].length > 1
-      list = attribute[:value].map { |la| "<li>#{la}</li>" }.join
+      list = attribute[:value].map { |value| "<li>#{value}</li>" }.join
       simple_format(list, { class: "govuk-list govuk-list--bullet" }, wrapper_tag: "ul")
     else
-      simple_format(attribute[:value].to_s, {}, wrapper_tag: "div")
+      value = attribute[:value].is_a?(Array) ? attribute[:value].first : attribute[:value]
+
+      simple_format(value.to_s, { class: "govuk-body" }, wrapper_tag: "p")
     end
   end
 end

spec/helpers/details_table_helper_spec.rb

@@ -7,8 +7,8 @@ RSpec.describe DetailsTableHelper do
     context "when given a simple attribute" do
       let(:attribute) { { name: "name", value: "Dummy org", editable: true } }
 
-      it "displays the string wrapped in a div" do
+      it "displays the string wrapped in a p" do
-        expect(details).to eq("<div>Dummy org</div>")
+        expect(details).to eq("<p class=\"govuk-body\">Dummy org</p>")
       end
     end
 
@@ -27,5 +27,21 @@ RSpec.describe DetailsTableHelper do
         expect(details).to eq("<ul class=\"govuk-list govuk-list--bullet\"><li>Camden</li><li>Westminster</li><li>Bristol</li></ul>")
       end
     end
+
+    context "when given a bullet point list with one attibute" do
+      let(:list) { %w[Camden] }
+      let(:attribute) do
+        {
+          name: "local_authorities_operated_in",
+          value: list,
+          editable: false,
+          format: :bullet,
+        }
+      end
+
+      it "displays the string wrapped in a p" do
+        expect(details).to eq("<p class=\"govuk-body\">Camden</p>")
+      end
+    end
   end
 end