Fix money formatting and feedback in Maternity/Paternity/Adopti… (#4212)

Fix money formatting and feedback in Maternity/Paternity/Adoption calculator

Author: chao-xian

app/presenters/money_question_presenter.rb

@@ -6,7 +6,7 @@ def response_label(value)
   end
 
   def hint_text
-    text = [body, "in £", suffix_label].reject(&:blank?).compact.join(", ")
+    text = [body, suffix_label].reject(&:blank?).compact.join(", ")
     ActionView::Base.full_sanitizer.sanitize(text)
   end
 end

lib/smart_answer/money.rb

@@ -27,7 +27,11 @@ def <=>(other)
     end
 
     def self.parse(raw_input)
-      raw_input.is_a?(Numeric) ? raw_input : raw_input.to_s.delete(",").gsub(/\s/, "")
+      if raw_input.is_a?(Numeric)
+        raw_input
+      else
+        raw_input.to_s.delete(",").gsub(/\s/, "").gsub(/£/, "")
+      end
     end
 
     def self.validate!(input)

lib/smart_answer_flows/maternity-paternity-calculator/questions/_earnings_question_error_message.govspeak.erb

@@ -0,0 +1,3 @@
+<% content_for :error_message do %>
+  Use numbers like 12.34
+<% end %>

lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period.govspeak.erb

@@ -5,3 +5,5 @@
 <% content_for :hint do %>
   This is their earnings before deductions like PAYE, pension or National Insurance contributions.
 <% end %>
+
+<%= render partial: 'earnings_question_error_message.govspeak.erb' %>

lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_adoption.govspeak.erb

@@ -6,6 +6,4 @@
   This is their earnings before deductions like PAYE, pension or National Insurance contributions.
 <% end %>
 
-<% content_for :error_message do %>
-  Please enter a number greater than 0
-<% end %>
+<%= render partial: 'earnings_question_error_message.govspeak.erb' %>

lib/smart_answer_flows/maternity-paternity-calculator/questions/earnings_for_pay_period_paternity.govspeak.erb

@@ -5,3 +5,5 @@
 <% content_for :hint do %>
   This is the earnings before deductions like PAYE, pension or National Insurance contributions.
 <% end %>
+
+<%= render partial: 'earnings_question_error_message.govspeak.erb' %>

test/unit/money_test.rb

@@ -24,6 +24,11 @@ class MoneyTest < ActiveSupport::TestCase
       assert two == 2000
     end
 
+    test "Values with £ sign are stripped out and parsed correctly" do
+      salary = SmartAnswer::Money.new("£15000")
+      assert salary == 15000
+    end
+
     test "should be possible to initialize with a BigDecimal" do
       v = BigDecimal("1234.5678")
       money = SmartAnswer::Money.new(v)