From 01665ef3fe9f652f7fe8030ee2d8d9161f5c0772 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Tue, 21 Jul 2015 15:03:40 +0100 Subject: [PATCH 1/3] Add missing phrase for maternity-paternity-calculator The text was supplied by @lutgendorff. This adds a useful phrase when `leave_type == 'adoption'`. Before converting to ERB, a `leave_type` of 'adoption' resulted in the "adoption_spp_claim_link" placeholder appearing in the outcome page. See the following URL for an example of the placeholder appearing incorrectly (NOTE. This will no longer be visible once the switch to ERB has been deployed): https://www.gov.uk/maternity-paternity-calculator/y/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01 --- .../_spp_claim_link.govspeak.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/smart_answer_flows/maternity-paternity-calculator/_spp_claim_link.govspeak.erb b/lib/smart_answer_flows/maternity-paternity-calculator/_spp_claim_link.govspeak.erb index 120984e428a..5c46ef58386 100644 --- a/lib/smart_answer_flows/maternity-paternity-calculator/_spp_claim_link.govspeak.erb +++ b/lib/smart_answer_flows/maternity-paternity-calculator/_spp_claim_link.govspeak.erb @@ -5,4 +5,7 @@ <% when 'paternity_adoption' %> The latest date for them to [claim SPP](/employers-paternity-pay-leave/adoption) is usually 15 days before they want it to start. +<% when 'adoption' %> + + The latest date for them to [claim SAP](/employers-adoption-pay-leave/entitlement) is usually 15 days before they want it to start. <% end %> From db29a3cc0d80fcddd974f9a3754a3655113e3591 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 23 Jul 2015 11:36:59 +0100 Subject: [PATCH 2/3] Update maternity-paternity-calculator-files Updated using: $ rails r script/generate-checksums-for-smart-answer.rb \ maternity-paternity-calculator --- test/data/maternity-paternity-calculator-files.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/data/maternity-paternity-calculator-files.yml b/test/data/maternity-paternity-calculator-files.yml index aa64a573efc..a7a82d7892e 100644 --- a/test/data/maternity-paternity-calculator-files.yml +++ b/test/data/maternity-paternity-calculator-files.yml @@ -10,7 +10,7 @@ lib/smart_answer_flows/maternity-paternity-calculator/_paternity_entitled_to_lea lib/smart_answer_flows/maternity-paternity-calculator/_paternity_not_entitled_to_leave.govspeak.erb: 259c94c05e36f09f3a3e8af67a889bd9 lib/smart_answer_flows/maternity-paternity-calculator/_paternity_not_entitled_to_pay_intro.govspeak.erb: c1098876fb283e340972de778eec026a lib/smart_answer_flows/maternity-paternity-calculator/_paternity_not_entitled_to_pay_outro.govspeak.erb: b12fe1f375c8587eca7bb7ddb99379b2 -lib/smart_answer_flows/maternity-paternity-calculator/_spp_claim_link.govspeak.erb: d84efdddd33193f19631cb60b882face +lib/smart_answer_flows/maternity-paternity-calculator/_spp_claim_link.govspeak.erb: 9ab61a0abfb3612d4a51666bf52716c0 lib/smart_answer_flows/maternity-paternity-calculator/adoption_leave_and_pay.govspeak.erb: ce422d13348686abac93edcf94075748 lib/smart_answer_flows/maternity-paternity-calculator/adoption_not_entitled_to_leave_or_pay.govspeak.erb: 1f96635ef1a36f69f7757e1554a40070 lib/smart_answer_flows/maternity-paternity-calculator/maternity_leave_and_pay_result.govspeak.erb: 35066a095224d56af5153769db91d721 From 931b851b9639e277d023b65d83b058212e65ee87 Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Thu, 23 Jul 2015 11:35:51 +0100 Subject: [PATCH 3/3] Update test artefacts for maternity-paternity-calculator Updated using: $ time RUN_REGRESSION_TESTS=maternity-paternity-calculator \ ruby test/regression/smart_answers_regression_test.rb --- .../every_2_weeks/3000.0/usual_paydates/2015-01-01.txt | 2 ++ .../every_4_weeks/3000.0/usual_paydates/2015-01-01.txt | 2 ++ .../2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt | 2 ++ .../every_2_weeks/3000.0/usual_paydates/2015-01-01.txt | 2 ++ .../every_4_weeks/3000.0/usual_paydates/2015-01-01.txt | 2 ++ .../2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt | 2 ++ 6 files changed, 12 insertions(+) diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt index d094892cc69..f60d1a2f744 100644 --- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt +++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt @@ -40,4 +40,6 @@ Date | SPP amount %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).% +The latest date for them to [claim SAP](/employers-adoption-pay-leave/entitlement) is usually 15 days before they want it to start. + Read the [guide to Statutory Paternity Pay and Leave](/paternity-leave-pay-employees) diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt index ed91d122ed4..15531d57893 100644 --- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt +++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt @@ -33,4 +33,6 @@ Date | SPP amount %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).% +The latest date for them to [claim SAP](/employers-adoption-pay-leave/entitlement) is usually 15 days before they want it to start. + Read the [guide to Statutory Paternity Pay and Leave](/paternity-leave-pay-employees) diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt index c9e9764d104..915864ed6a7 100644 --- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt +++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/no/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt @@ -66,4 +66,6 @@ Date | SPP amount %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).% +The latest date for them to [claim SAP](/employers-adoption-pay-leave/entitlement) is usually 15 days before they want it to start. + Read the [guide to Statutory Paternity Pay and Leave](/paternity-leave-pay-employees) diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt index d094892cc69..f60d1a2f744 100644 --- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt +++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_2_weeks/3000.0/usual_paydates/2015-01-01.txt @@ -40,4 +40,6 @@ Date | SPP amount %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).% +The latest date for them to [claim SAP](/employers-adoption-pay-leave/entitlement) is usually 15 days before they want it to start. + Read the [guide to Statutory Paternity Pay and Leave](/paternity-leave-pay-employees) diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt index ed91d122ed4..15531d57893 100644 --- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt +++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/every_4_weeks/3000.0/usual_paydates/2015-01-01.txt @@ -33,4 +33,6 @@ Date | SPP amount %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).% +The latest date for them to [claim SAP](/employers-adoption-pay-leave/entitlement) is usually 15 days before they want it to start. + Read the [guide to Statutory Paternity Pay and Leave](/paternity-leave-pay-employees) diff --git a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt index c9e9764d104..915864ed6a7 100644 --- a/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt +++ b/test/artefacts/maternity-paternity-calculator/adoption/no/2015-04-05/2015-04-06/yes/yes/yes/2015-04-06/2015-01-01/2014-11-01/weekly/3000.0/usual_paydates/2015-01-01.txt @@ -66,4 +66,6 @@ Date | SPP amount %This calculator doesn’t check eligibility for [Shared Parental Leave and Pay](/shared-parental-leave-and-pay-employer-guide).% +The latest date for them to [claim SAP](/employers-adoption-pay-leave/entitlement) is usually 15 days before they want it to start. + Read the [guide to Statutory Paternity Pay and Leave](/paternity-leave-pay-employees)