Some tests

spec/features/lettings_log_spec.rb

@@ -270,6 +270,10 @@ RSpec.describe "Lettings Log Features" do
     context "when visiting a subsection check answers page" do
       let(:lettings_log) { create(:lettings_log, :setup_completed) }
 
+      before do
+        lettings_log.owning_organisation.update!(name: "MHCLG")
+      end
+
       it "has the correct breadcrumbs with the correct links" do
         visit lettings_log_setup_check_answers_path(lettings_log)
         breadcrumbs = page.find_all(".govuk-breadcrumbs__link")
@@ -286,6 +290,10 @@ RSpec.describe "Lettings Log Features" do
     context "when reviewing a complete log" do
       let(:lettings_log) { create(:lettings_log, :completed) }
 
+      before do
+        lettings_log.owning_organisation.update!(name: "MHCLG")
+      end
+
       it "has the correct breadcrumbs with the correct links" do
         visit review_lettings_log_path(lettings_log)
         breadcrumbs = page.find_all(".govuk-breadcrumbs__link")

spec/features/sales_log_spec.rb

@@ -253,6 +253,10 @@ RSpec.describe "Sales Log Features" do
     end
 
     context "when visiting a subsection check answers page as a support user" do
+      before do
+        sales_log.owning_organisation.update!(name: "MHCLG")
+      end
+
       it "has the correct breadcrumbs with the correct links" do
         visit sales_log_setup_check_answers_path(sales_log.id)
         breadcrumbs = page.find_all(".govuk-breadcrumbs__link")
@@ -267,6 +271,10 @@ RSpec.describe "Sales Log Features" do
     end
 
     context "when reviewing a complete log" do
+      before do
+        sales_log.owning_organisation.update!(name: "MHCLG")
+      end
+
       it "has the correct breadcrumbs with the correct links" do
         visit review_sales_log_path(sales_log.id, sales_log: true)
         breadcrumbs = page.find_all(".govuk-breadcrumbs__link")

spec/features/schemes_spec.rb

@@ -197,6 +197,7 @@ RSpec.describe "Schemes scheme Features" do
 
       context "when I visit schemes page" do
         before do
+          user.organisation.update!(name: "MHCLG")
           visit("schemes")
         end
 

spec/fixtures/exports/general_needs_log.xml

@@ -147,10 +147,10 @@
     <duplicate_set_id/>
     <formid>{id}</formid>
     <owningorgid>{owning_org_id}</owningorgid>
-    <owningorgname>MHCLG</owningorgname>
+    <owningorgname>{owning_org_name}</owningorgname>
     <hcnum>1234</hcnum>
     <maningorgid>{managing_org_id}</maningorgid>
-    <maningorgname>MHCLG</maningorgname>
+    <maningorgname>{managing_org_name}</maningorgname>
     <manhcnum>1234</manhcnum>
     <createddate>2022-05-01T00:00:00+01:00</createddate>
     <uploaddate>2022-05-01T00:00:00+01:00</uploaddate>

spec/fixtures/exports/general_needs_log_23_24.xml

@@ -148,10 +148,10 @@
     <duplicate_set_id/>
     <formid>{id}</formid>
     <owningorgid>{owning_org_id}</owningorgid>
-    <owningorgname>MHCLG</owningorgname>
+    <owningorgname>{owning_org_name}</owningorgname>
     <hcnum>1234</hcnum>
     <maningorgid>{managing_org_id}</maningorgid>
-    <maningorgname>MHCLG</maningorgname>
+    <maningorgname>{managing_org_name}</maningorgname>
     <manhcnum>1234</manhcnum>
     <createddate>2023-04-03T00:00:00+01:00</createddate>
     <uploaddate>2023-04-03T00:00:00+01:00</uploaddate>

spec/fixtures/exports/general_needs_log_24_25.xml

@@ -161,10 +161,10 @@
     <la_as_entered>la as entered</la_as_entered>
     <formid>{id}</formid>
     <owningorgid>{owning_org_id}</owningorgid>
-    <owningorgname>MHCLG</owningorgname>
+    <owningorgname>{owning_org_name}</owningorgname>
     <hcnum>1234</hcnum>
     <maningorgid>{managing_org_id}</maningorgid>
-    <maningorgname>MHCLG</maningorgname>
+    <maningorgname>{managing_org_name}</maningorgname>
     <manhcnum>1234</manhcnum>
     <createddate>2024-04-03T00:00:00+01:00</createddate>
     <uploaddate>2024-04-03T00:00:00+01:00</uploaddate>

spec/fixtures/exports/organisation.xml

@@ -2,7 +2,7 @@
 <forms>
   <form>
     <id>{id}</id>
-    <name>MHCLG</name>
+    <name>{name}</name>
     <phone/>
     <provider_type>1</provider_type>
     <address_line1>2 Marsham Street</address_line1>

spec/fixtures/exports/supported_housing_logs.xml

@@ -146,10 +146,10 @@
     <duplicate_set_id/>
     <formid>{id}</formid>
     <owningorgid>{owning_org_id}</owningorgid>
-    <owningorgname>MHCLG</owningorgname>
+    <owningorgname>{owning_org_name}</owningorgname>
     <hcnum>1234</hcnum>
     <maningorgid>{managing_org_id}</maningorgid>
-    <maningorgname>MHCLG</maningorgname>
+    <maningorgname>{managing_org_name}</maningorgname>
     <manhcnum>1234</manhcnum>
     <createddate>2022-05-01T00:00:00+01:00</createddate>
     <uploaddate>2022-05-01T00:00:00+01:00</uploaddate>

spec/fixtures/exports/user.xml

@@ -12,6 +12,6 @@
     <is_dpo>false</is_dpo>
     <is_key_contact>false</is_key_contact>
     <active>true</active>
-    <organisation_name>MHCLG</organisation_name>
+    <organisation_name>{organisation_name}</organisation_name>
   </form>
 </forms>

spec/helpers/tab_nav_helper_spec.rb

@@ -1,7 +1,7 @@
 require "rails_helper"
 
 RSpec.describe TabNavHelper do
-  let(:organisation) { FactoryBot.create(:organisation) }
+  let(:organisation) { FactoryBot.create(:organisation, name: "MHCLG") }
   let(:current_user) { FactoryBot.build(:user, organisation:) }
   let(:scheme) { FactoryBot.create(:scheme, service_name: "Some name") }
   let(:location) { FactoryBot.create(:location, scheme:) }

spec/models/form/lettings/questions/managing_organisation_spec.rb

@@ -185,7 +185,7 @@ RSpec.describe Form::Lettings::Questions::ManagingOrganisation, type: :model do
     context "when organisation has merged" do
       let(:absorbing_org) { create(:organisation, name: "Absorbing org", holds_own_stock: true) }
       let!(:merged_org) { create(:organisation, name: "Merged org", holds_own_stock: false) }
-      let!(:merged_deleted_org) { create(:organisation, name: "Merged org", holds_own_stock: false, discarded_at: Time.zone.yesterday) }
+      let!(:merged_deleted_org) { create(:organisation, name: "Merged org 2", holds_own_stock: false, discarded_at: Time.zone.yesterday) }
       let(:user) { create(:user, :data_coordinator, organisation: absorbing_org) }
 
       let(:log) do

spec/requests/merge_requests_controller_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe MergeRequestsController, type: :request do
 
   context "when user is signed in with a support user" do
     before do
+      organisation.update!(name: "MHCLG")
       allow(support_user).to receive(:need_two_factor_authentication?).and_return(false)
       sign_in support_user
     end

spec/requests/organisation_relationships_controller_spec.rb

@@ -58,7 +58,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
 
           context "when adding a stock owner" do
             let!(:active_organisation) { FactoryBot.create(:organisation, name: "Active Org", active: true) }
-            let!(:inactive_organisation) { FactoryBot.create(:organisation, name: "Inactive LTD", active: false) }
+            let!(:inactive_organisation) { FactoryBot.create(:organisation, name: "Inactive LTD 2", active: false) }
 
             before do
               get "/organisations/#{organisation.id}/stock-owners/add", headers:, params: {}
@@ -115,7 +115,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
           let!(:managing_agent) { FactoryBot.create(:organisation) }
           let!(:other_org_managing_agent) { FactoryBot.create(:organisation, name: "Foobar LTD") }
           let!(:inactive_managing_agent) { FactoryBot.create(:organisation, name: "Inactive LTD", active: false) }
-          let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD") }
+          let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD 3") }
 
           before do
             FactoryBot.create(:organisation_relationship, parent_organisation: organisation, child_organisation: managing_agent)
@@ -316,7 +316,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
         context "with an organisation that the user belongs to" do
           let!(:stock_owner) { FactoryBot.create(:organisation) }
           let!(:other_org_stock_owner) { FactoryBot.create(:organisation, name: "Foobar LTD") }
-          let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD") }
+          let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD 2") }
 
           before do
             FactoryBot.create(:organisation_relationship, child_organisation: organisation, parent_organisation: stock_owner)
@@ -452,7 +452,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
         context "with an organisation that the user belongs to" do
           let!(:managing_agent) { FactoryBot.create(:organisation) }
           let!(:other_org_managing_agent) { FactoryBot.create(:organisation, name: "Foobar LTD") }
-          let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD") }
+          let!(:other_organisation) { FactoryBot.create(:organisation, name: "Foobar LTD 5") }
 
           before do
             FactoryBot.create(:organisation_relationship, parent_organisation: organisation, child_organisation: managing_agent)

spec/services/exports/lettings_log_export_service_spec.rb

@@ -21,7 +21,9 @@ RSpec.describe Exports::LettingsLogExportService do
   def replace_entity_ids(lettings_log, export_template)
     export_template.sub!(/\{id\}/, (lettings_log["id"] + Exports::LettingsLogExportService::LOG_ID_OFFSET).to_s)
     export_template.sub!(/\{owning_org_id\}/, (lettings_log["owning_organisation_id"] + Exports::LettingsLogExportService::LOG_ID_OFFSET).to_s)
+    export_template.sub!(/\{owning_org_name\}/, lettings_log.owning_organisation.name)
     export_template.sub!(/\{managing_org_id\}/, (lettings_log["managing_organisation_id"] + Exports::LettingsLogExportService::LOG_ID_OFFSET).to_s)
+    export_template.sub!(/\{managing_org_name\}/, lettings_log.managing_organisation.name)
     export_template.sub!(/\{location_id\}/, (lettings_log["location_id"]).to_s) if lettings_log.needstype == 2
     export_template.sub!(/\{scheme_id\}/, (lettings_log["scheme_id"]).to_s) if lettings_log.needstype == 2
     export_template.sub!(/\{log_id\}/, lettings_log["id"].to_s)

spec/services/exports/organisation_export_service_spec.rb

@@ -16,6 +16,7 @@ RSpec.describe Exports::OrganisationExportService do
 
   def replace_entity_ids(organisation, export_template)
     export_template.sub!(/\{id\}/, organisation["id"].to_s)
+    export_template.sub!(/\{name\}/, organisation["name"])
     export_template.sub!(/\{dsa_signed_at\}/, organisation.data_protection_confirmation&.signed_at.to_s)
     export_template.sub!(/\{dpo_email\}/, organisation.data_protection_confirmation&.data_protection_officer_email)
   end

spec/services/exports/user_export_service_spec.rb

@@ -17,6 +17,7 @@ RSpec.describe Exports::UserExportService do
   def replace_entity_ids(user, export_template)
     export_template.sub!(/\{id\}/, user["id"].to_s)
     export_template.sub!(/\{organisation_id\}/, user["organisation_id"].to_s)
+    export_template.sub!(/\{organisation_name\}/, user.organisation.name)
     export_template.sub!(/\{email\}/, user["email"].to_s)
   end