From 714fa413b53d91c1588dfb4901f394f68f7d1a1c Mon Sep 17 00:00:00 2001
From: Kat <54268893+kosiakkatrina@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:17:54 +0000
Subject: [PATCH] Fix some flaky tests

---
 .../organisation_relationships_controller_spec.rb         | 8 ++++----
 spec/requests/organisations_controller_spec.rb            | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

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