From 918cf0f08f832aadf15cad9a51c541b7eb8554d7 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:54:53 +0000
Subject: [PATCH] CLDC-2434 Fix test warnings and update some flaky tests
 (#2850)

* Remove test warnings

* Fix some flaky tests
---
 spec/requests/lettings_logs_controller_spec.rb            | 2 +-
 .../organisation_relationships_controller_spec.rb         | 8 ++++----
 spec/requests/organisations_controller_spec.rb            | 6 +++---
 spec/requests/sales_logs_controller_spec.rb               | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb
index 3d2c27400..e795b76ea 100644
--- a/spec/requests/lettings_logs_controller_spec.rb
+++ b/spec/requests/lettings_logs_controller_spec.rb
@@ -1483,7 +1483,7 @@ RSpec.describe LettingsLogsController, type: :request do
     end
 
     context "when viewing a collection of logs affected by deactivated location" do
-      let!(:affected_lettings_logs) { FactoryBot.create_list(:lettings_log, 3, unresolved: true, assigned_to: user) }
+      let!(:affected_lettings_logs) { FactoryBot.create_list(:lettings_log, 3, unresolved: true, assigned_to: user, tenancycode: "affected tenancycode", propcode: "affected propcode") }
       let!(:other_user_affected_lettings_log) { FactoryBot.create(:lettings_log, unresolved: true) }
       let!(:non_affected_lettings_logs) { FactoryBot.create_list(:lettings_log, 4, assigned_to: user) }
       let(:other_user) { FactoryBot.create(:user, organisation: user.organisation) }
diff --git a/spec/requests/organisation_relationships_controller_spec.rb b/spec/requests/organisation_relationships_controller_spec.rb
index feb687e0c..79706fff9 100644
--- a/spec/requests/organisation_relationships_controller_spec.rb
+++ b/spec/requests/organisation_relationships_controller_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
           it "shows a table of stock owners" do
             expected_html = "<table class=\"govuk-table\""
             expect(response.body).to include(expected_html)
-            expect(response.body).to include(stock_owner.name)
+            expect(CGI.unescapeHTML(response.body)).to include(stock_owner.name)
           end
 
           it "shows only stock owners for the current user's organisation" do
@@ -136,7 +136,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
           it "shows a table of managing-agents" do
             expected_html = "<table class=\"govuk-table\""
             expect(response.body).to include(expected_html)
-            expect(response.body).to include(managing_agent.name)
+            expect(CGI.unescapeHTML(response.body)).to include(managing_agent.name)
           end
 
           it "shows only managing-agents for the current user's organisation" do
@@ -336,7 +336,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
           it "shows a table of stock owners" do
             expected_html = "<table class=\"govuk-table\""
             expect(response.body).to include(expected_html)
-            expect(response.body).to include(stock_owner.name)
+            expect(CGI.unescapeHTML(response.body)).to include(stock_owner.name)
           end
 
           it "shows only stock owners for the current user's organisation" do
@@ -472,7 +472,7 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
           it "shows a table of managing agents" do
             expected_html = "<table class=\"govuk-table\""
             expect(response.body).to include(expected_html)
-            expect(response.body).to include(managing_agent.name)
+            expect(CGI.unescapeHTML(response.body)).to include(managing_agent.name)
           end
 
           it "shows only managing agents for the current user's organisation" do
diff --git a/spec/requests/organisations_controller_spec.rb b/spec/requests/organisations_controller_spec.rb
index c99ad3cfb..ae3297d59 100644
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@@ -487,7 +487,7 @@ RSpec.describe OrganisationsController, type: :request do
           it "shows a summary list of org details" do
             expected_html = "<dl class=\"govuk-summary-list\""
             expect(response.body).to include(expected_html)
-            expect(response.body).to include(organisation.name)
+            expect(CGI.unescapeHTML(response.body)).to include(organisation.name)
           end
 
           it "does not include a change details link" do
@@ -663,7 +663,7 @@ RSpec.describe OrganisationsController, type: :request do
           end
 
           it "shows an edit form without name field" do
-            expect(response.body).to include("Change #{organisation.name}’s details")
+            expect(CGI.unescapeHTML(response.body)).to include("Change #{organisation.name}’s details")
             expect(page).not_to have_field("organisation-name-field")
             expect(page).to have_field("organisation-phone-field")
           end
@@ -945,7 +945,7 @@ RSpec.describe OrganisationsController, type: :request do
           it "shows a summary list of org details" do
             expected_html = "<dl class=\"govuk-summary-list\""
             expect(response.body).to include(expected_html)
-            expect(response.body).to include(organisation.name)
+            expect(CGI.unescapeHTML(response.body)).to include(organisation.name)
           end
 
           it "does not have a change details link" do
diff --git a/spec/requests/sales_logs_controller_spec.rb b/spec/requests/sales_logs_controller_spec.rb
index 4c6ca3cc1..dc056c1ed 100644
--- a/spec/requests/sales_logs_controller_spec.rb
+++ b/spec/requests/sales_logs_controller_spec.rb
@@ -299,7 +299,7 @@ RSpec.describe SalesLogsController, type: :request do
 
           it "does not render pending logs" do
             get "/sales-logs", headers: headers, params: {}
-            expect(page).not_to have_link(invisible_log.id, href: "sales-logs/#{invisible_log.id}")
+            expect(page).not_to have_link(invisible_log.id.to_s, href: "sales-logs/#{invisible_log.id}")
           end
         end