From 74b50d5979b0fd3507ae1b4e58591e13fdecf24b Mon Sep 17 00:00:00 2001
From: Spencer Dixon <spencerlloyddixon@gmail.com>
Date: Wed, 28 Aug 2024 16:33:41 +0100
Subject: [PATCH] Improve regex for financial variables check (#4156)

* Improves the regex for financial variables check to look for html entities and codes as well as characters

* Added minimum salary variable to salaries-banner
---
 app/views/content/home/_salaries-banner.html.erb | 2 +-
 spec/support/page_testing_support.rb             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/content/home/_salaries-banner.html.erb b/app/views/content/home/_salaries-banner.html.erb
index 1008298706..ce5f9f5dee 100644
--- a/app/views/content/home/_salaries-banner.html.erb
+++ b/app/views/content/home/_salaries-banner.html.erb
@@ -1,6 +1,6 @@
 <div id="salary-banner" class="banner">
   <%= render CallsToAction::SimpleComponent.new(icon: "icon-money") do %>
-    <h2 class="call-to-action__heading">Earn a minimum of &pound;30k a year</h2>
+    <h2 class="call-to-action__heading">Earn a minimum of <%= v :salaries_starting_minshortened %> a year</h2>
     <p>All qualified teachers get a <strong>minimum starting salary of <%= v :salaries_starting_minshortened %></strong> (or higher in London), so it pays to do what you love.</p>
     <p>And with lots of opportunities to progress, you could <strong>earn over <%= v :salaries_fiveyears_maxshortened %> within 5 years</strong>.</p>
     <p><%= link_to("Find out more about teacher pay", page_path("life-as-a-teacher/pay-and-benefits/teacher-pay")) %>.</p>
diff --git a/spec/support/page_testing_support.rb b/spec/support/page_testing_support.rb
index 29153f7b2d..590823179d 100644
--- a/spec/support/page_testing_support.rb
+++ b/spec/support/page_testing_support.rb
@@ -111,5 +111,5 @@ def build_url(host, link)
 end
 
 class MonetaryChecker
-  MONEY_REGEXP = /([$£€]\d+(,\d{3})*([.,]\d{1,2}p?)?k?)/m
+  MONEY_REGEXP = /(([$£€]|&dollar;|&pound;|&euro;|&#36;|&#163;|&#8364;)\d+(,\d{3})*([.,]\d{1,2}p?)?k?)/m
 end