Merge pull request #3654 from nhsuk/fix-incomplete-location-address-formatting

Refactor location display to handle missing addresses gracefully

Author: jhenderson

app/helpers/address_helper.rb

@@ -8,4 +8,10 @@ def format_address_multi_line(addressable)
   def format_address_single_line(addressable)
     addressable.address_parts.join(", ")
   end
+
+  def format_location_name_and_address_single_line(location)
+    [location.name, format_address_single_line(location)].compact_blank.join(
+      ", "
+    )
+  end
 end

app/views/draft_vaccination_records/location.html.erb

@@ -14,7 +14,7 @@
                                                text: title } do %>
 
     <% @locations.each do |location| %>
-      <%= f.govuk_radio_button :location_name, "#{location.name}, #{format_address_single_line(location)}",
+      <%= f.govuk_radio_button :location_name, format_location_name_and_address_single_line(location),
                                label: { text: location.name },
                                hint: { text: format_address_single_line(location) } %>
     <% end %>

spec/helpers/address_helper_spec.rb

@@ -4,6 +4,7 @@
   let(:location) do
     create(
       :school,
+      name: "School of Politics",
       address_line_1: "10 Downing Street",
       address_town: "London",
       address_postcode: "SW1A 1AA"
@@ -21,4 +22,26 @@
 
     it { should eq("10 Downing Street, London, SW1A 1AA") }
   end
+
+  describe "#format_location_name_and_address_single_line" do
+    subject(:formatted_string) do
+      helper.format_location_name_and_address_single_line(location)
+    end
+
+    it { should eq("School of Politics, 10 Downing Street, London, SW1A 1AA") }
+
+    context "with a nil address" do
+      let(:location) do
+        create(
+          :school,
+          name: "School of Politics",
+          address_line_1: "",
+          address_town: "",
+          address_postcode: ""
+        )
+      end
+
+      it { should eq("School of Politics") }
+    end
+  end
 end