Update local authority (#1377)

app/forms/registration/local_authority_form.rb

@@ -8,15 +8,7 @@ class LocalAuthorityForm < BaseForm
     def save
       return false unless valid?
 
-      user.update!(local_authority: local_authority_clean)
-    end
-
-  private
-
-    # @see Trainee:Authority#persisted_name
-    # @return [String] remove old name suffix
-    def local_authority_clean
-      local_authority.gsub(/\(.*?\)/, '').strip
+      user.update!(local_authority: local_authority)
     end
   end
 end

app/models/trainee/authority.rb

@@ -11,13 +11,5 @@ def self.all
     def self.data
       YAML.load_file Rails.root.join('data/local-authority.yml')
     end
-
-    # @example
-    #   Sanitise LA name changes before persisting
-    #     "Cumberland (previously Cumbria)" => "Cumberland"
-    # @return [String]
-    def persisted_name
-      name.gsub(/\(.*?\)/, '').strip
-    end
   end
 end

data/local-authority.yml

@@ -29,7 +29,7 @@
 - name: County Durham
 - name: Coventry
 - name: Croydon
-- name: Cumberland (previously Cumbria)
+- name: Cumberland
 - name: Darlington
 - name: Derby
 - name: Derbyshire
@@ -143,7 +143,7 @@
 - name: West Northamptonshire
 - name: West Sussex
 - name: Westminster
-- name: Westmorland and Furness (previously Cumbria)
+- name: Westmorland and Furness
 - name: Wigan
 - name: Wiltshire
 - name: Windsor and Maidenhead

spec/requests/registration/local_authorities_spec.rb

@@ -25,7 +25,7 @@
     end
 
     context 'with available option' do
-      let(:local_authority) { Trainee::Authority.all.sample.persisted_name }
+      let(:local_authority) { Trainee::Authority.all.sample.name }
 
       it 'updates user' do
         expect { update_user }.to change { user.reload.local_authority }.to(local_authority)