spiked and fixed some tests

app/helpers/tab_nav_helper.rb

@@ -1,44 +1,32 @@
+module TabNavHelper
+  using RefinementTest
+  include GovukLinkHelper
 
-  module TabNavHelper
+  def user_cell(user)
-    include GovukLinkHelper
+    link_text = user.name.presence || user.email
-    include Helpers
+    [govuk_link_to(link_text, user), "<span class=\"govuk-visually-hidden\">User </span><span class=\"govuk-!-font-weight-regular app-!-colour-muted\">#{user.email}</span>"].join("\n")
-    using FormatPostcode
+  end
-    
 
-    def user_cell(user)
+  def location_cell(location, link)
-      link_text = user.name.presence || user.email
+    link_text = location.postcode.formatted_postcode
-      [govuk_link_to(link_text, user), "<span class=\"govuk-visually-hidden\">User </span><span class=\"govuk-!-font-weight-regular app-!-colour-muted\">#{user.email}</span>"].join("\n")
+    [govuk_link_to(link_text, link, method: :patch), "<span class=\"govuk-visually-hidden\">Location </span><span class=\"govuk-!-font-weight-regular app-!-colour-muted\">#{location.name}</span>"].join("\n")
-    end
+  end
 
-<<<<<<< Updated upstream
   def scheme_cell(scheme)
     link_text = scheme.service_name
     link = scheme.confirmed? ? scheme : scheme_check_answers_path(scheme)
     [govuk_link_to(link_text, link), "<span class=\"govuk-visually-hidden\">Scheme </span><span class=\"govuk-!-font-weight-regular app-!-colour-muted\">#{scheme.primary_client_group}</span>"].join("\n")
   end
-=======
-    def location_cell(location, link)
-     
-      link_text = location.postcode.formatted_postcode
-      [govuk_link_to(link_text, link, method: :patch), "<span class=\"govuk-visually-hidden\">Location </span><span class=\"govuk-!-font-weight-regular app-!-colour-muted\">#{location.name}</span>"].join("\n")
-    end
->>>>>>> Stashed changes
-
-    def scheme_cell(scheme)
-      link_text = scheme.service_name
-      [govuk_link_to(link_text, scheme), "<span class=\"govuk-visually-hidden\">Scheme </span><span class=\"govuk-!-font-weight-regular app-!-colour-muted\">#{scheme.primary_client_group}</span>"].join("\n")
-    end
 
-    def org_cell(user)
+  def org_cell(user)
-      role = "<span class=\"app-!-colour-muted\">#{user.role.to_s.humanize}</span>"
+    role = "<span class=\"app-!-colour-muted\">#{user.role.to_s.humanize}</span>"
-      [user.organisation.name, role].join("\n")
+    [user.organisation.name, role].join("\n")
-    end
-
-    def tab_items(user)
-      [
-        { name: t("Details"), url: details_organisation_path(user.organisation) },
-        { name: t("Users"), url: users_organisation_path(user.organisation) },
-      ]
-    end
   end
 
+  def tab_items(user)
+    [
+      { name: t("Details"), url: details_organisation_path(user.organisation) },
+      { name: t("Users"), url: users_organisation_path(user.organisation) },
+    ]
+  end
+end

app/models/case_log.rb

@@ -574,12 +574,12 @@ private
   end
 
   def process_postcode_changes!
-    self.postcode_full = format_postcode(postcode_full)
+    self.postcode_full = upcase_and_remove_whitespace(postcode_full)
     process_postcode(postcode_full, "postcode_known", "is_la_inferred", "la")
   end
 
   def process_previous_postcode_changes!
-    self.ppostcode_full = format_postcode(ppostcode_full)
+    self.ppostcode_full = upcase_and_remove_whitespace(ppostcode_full)
     process_postcode(ppostcode_full, "ppcodenk", "is_previous_la_inferred", "prevloc")
   end
 
@@ -699,4 +699,8 @@ private
 
     (value * 52 / num_of_weeks).round(2)
   end
+
+  def upcase_and_remove_whitespace(string)
+    string.present? ? string.upcase.gsub(/\s+/, "") : string
+  end
 end

app/models/form/setup/questions/location_id.rb

@@ -1,5 +1,6 @@
 class Form::Setup::Questions::LocationId < ::Form::Question
-  using FormatPostcode
+  using RefinementTest
+
   def initialize(_id, hsh, page)
     super("location_id", hsh, page)
     @check_answer_label = "Location"

app/services/refinement_test.rb

@@ -1,7 +1,7 @@
-module FormatPostcode
+module RefinementTest
-    refine FormatPostcode do
+  refine String do
     def formatted_postcode
-      postcode = upcase.gsub(/\s+/, "")
+      postcode = self.upcase.gsub(/\s+/, "")
       case postcode.length
       when 5
         postcode.insert(2, " ")
@@ -14,4 +14,4 @@ module FormatPostcode
       end
     end
   end
-  
+end

config/application.rb

@@ -15,8 +15,6 @@ require "action_view/railtie"
 # require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
-require_relative '../lib/ext/string'
-
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)

spec/requests/locations_controller_spec.rb

@@ -1,5 +1,7 @@
 require "rails_helper"
 
+using RefinementTest
+
 RSpec.describe LocationsController, type: :request do
   let(:page) { Capybara::Node::Simple.new(response.body) }
   let(:user) { FactoryBot.create(:user, :support) }
@@ -802,7 +804,7 @@ RSpec.describe LocationsController, type: :request do
       it "shows scheme" do
         locations.each do |location|
           expect(page).to have_content(location.id)
-          expect(page).to have_content(location.postcode)
+          expect(page).to have_content(location.postcode.formatted_postcode)
           expect(page).to have_content(location.type_of_unit)
           expect(page).to have_content(location.startdate&.to_formatted_s(:govuk_date))
         end
@@ -904,7 +906,7 @@ RSpec.describe LocationsController, type: :request do
       it "shows scheme" do
         locations.each do |location|
           expect(page).to have_content(location.id)
-          expect(page).to have_content(location.postcode)
+          expect(page).to have_content(location.postcode.formatted_postcode)
           expect(page).to have_content(location.type_of_unit)
           expect(page).to have_content(location.startdate&.to_formatted_s(:govuk_date))
         end