From 0cd57afd255732bbca91371d1b71a1dddf193cf6 Mon Sep 17 00:00:00 2001
From: baarkerlounger <db@slothlife.xyz>
Date: Tue, 7 Dec 2021 15:06:43 +0000
Subject: [PATCH] PR comments

---
 app/models/organisation.rb                     | 2 +-
 app/views/organisations/edit.html.erb          | 2 ++
 spec/requests/organisations_controller_spec.rb | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/organisation.rb b/app/models/organisation.rb
index 495e89903..6b63b612b 100644
--- a/app/models/organisation.rb
+++ b/app/models/organisation.rb
@@ -31,7 +31,7 @@ class Organisation < ApplicationRecord
       { name: "local_authorities_operated_in", value: local_authorities, editable: false },
       { name: "holds_own_stock", value: holds_own_stock, editable: false },
       { name: "other_stock_owners", value: other_stock_owners, editable: false },
-      { name: "managing_agents", value: managing_agents, editable: false }
+      { name: "managing_agents", value: managing_agents, editable: false },
     ]
   end
 end
diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb
index fc465aaa0..538af4791 100644
--- a/app/views/organisations/edit.html.erb
+++ b/app/views/organisations/edit.html.erb
@@ -19,10 +19,12 @@
       %>
 
       <%= f.govuk_text_field :address_line1,
+        label: -> { safe_join(["Building and street", " ", tag.span("line 1 of 2", class: "govuk-visually-hidden")]) },
         autocomplete: "address-line1"
       %>
 
       <%= f.govuk_text_field :address_line2,
+        label: { text: "Building and street line 2 of 2", hidden: true },
         autocomplete: "address-line2"
       %>
 
diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb
index 64705a113..ee1cb29ed 100644
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@@ -143,7 +143,7 @@ RSpec.describe OrganisationsController, type: :request do
           end
 
           it "shows an edit form" do
-            expect(response.body).to include("Change #{organisation.name}&#39;s details")
+            expect(response.body).to include("Change #{organisation.name}’s details")
             expect(page).to have_field("organisation-name-field")
             expect(page).to have_field("organisation-phone-field")
           end