From a1588bccc53dfd0bd4292bfd454aeb461212ef4a Mon Sep 17 00:00:00 2001 From: James Mead Date: Wed, 14 Oct 2015 13:58:20 +0100 Subject: [PATCH 1/2] Explicit Q-specific options for energy-grants-calculator This option was relying on the fallback to the string version of the option key. Fixes some of the failing tests in the regressions build [1]. [1]: https://ci-new.alphagov.co.uk/job/govuk_smart_answers_regressions/1187 --- lib/smart_answer_flows/locales/en/energy-grants-calculator.yml | 2 ++ test/data/energy-grants-calculator-files.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/smart_answer_flows/locales/en/energy-grants-calculator.yml b/lib/smart_answer_flows/locales/en/energy-grants-calculator.yml index 3442598c5b0..85429f29eea 100644 --- a/lib/smart_answer_flows/locales/en/energy-grants-calculator.yml +++ b/lib/smart_answer_flows/locales/en/energy-grants-calculator.yml @@ -23,6 +23,7 @@ en-GB: property: You own your property permission: You rent privately but have permission from the owner to make energy saving improvements (eg upgrade the boiler) social_housing: You’re a social housing tenant + none: none # Q2A what_are_your_circumstances_without_bills_help?: @@ -33,6 +34,7 @@ en-GB: benefits: You’re getting benefits property: You own your property permission: You rent privately but have permission from the owner to install or upgrade the boiler + none: none body: | Social housing tenants should talk to their social housing provider if they want to improve their energy efficiency. foot: | diff --git a/test/data/energy-grants-calculator-files.yml b/test/data/energy-grants-calculator-files.yml index 5d8ff522c4c..22d37cb843e 100644 --- a/test/data/energy-grants-calculator-files.yml +++ b/test/data/energy-grants-calculator-files.yml @@ -1,6 +1,6 @@ --- lib/smart_answer_flows/energy-grants-calculator.rb: 167b1c7372c43f754a91ce0dab85dede -lib/smart_answer_flows/locales/en/energy-grants-calculator.yml: cd46192351d40f256538061d41689a04 +lib/smart_answer_flows/locales/en/energy-grants-calculator.yml: dd640cd1e93bbdac129b3863552cb554 test/data/energy-grants-calculator-questions-and-responses.yml: e725aa49320518369f4fdc601cd217b2 test/data/energy-grants-calculator-responses-and-expected-results.yml: 7700bd72da2da267ae960e5d7eac91c2 lib/smart_answer_flows/energy-grants-calculator/_cold_weather_payment.govspeak.erb: 9976373a42df06bdb65e902166fb1d49 From 509128a9a91742a2f68b6976e2a4bb30f7a4e86a Mon Sep 17 00:00:00 2001 From: James Mead Date: Wed, 14 Oct 2015 14:01:44 +0100 Subject: [PATCH 2/2] Explicit Q-specific options for student-finance-forms There was a typo in the key for this option, so it was relying on the fallback to the string version of the option key. I've updated the test artefacts for the question page accordingly. Fixes some of the failing tests in the regressions build [1]. [1]: https://ci-new.alphagov.co.uk/job/govuk_smart_answers_regressions/1187 --- lib/smart_answer_flows/locales/en/student-finance-forms.yml | 4 +--- test/artefacts/student-finance-forms/uk-full-time.html | 2 +- .../uk-full-time/apply-loans-grants.html | 2 +- .../uk-full-time/apply-loans-grants/year-1516.html | 2 +- test/data/student-finance-forms-files.yml | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/smart_answer_flows/locales/en/student-finance-forms.yml b/lib/smart_answer_flows/locales/en/student-finance-forms.yml index 0e2d27c190c..3312a91d272 100644 --- a/lib/smart_answer_flows/locales/en/student-finance-forms.yml +++ b/lib/smart_answer_flows/locales/en/student-finance-forms.yml @@ -18,7 +18,7 @@ en-GB: form_needed_for_1?: title: What do you need the form for? options: - apply-loans_grants: Apply for student loans and grants + apply-loans-grants: Apply for student loans and grants proof-identity: Send proof of identity income-details: Send parent or partner’s income detail - eg PFF2 or CYI apply-dsa: Apply for Disabled Students’ Allowances @@ -47,5 +47,3 @@ en-GB: options: course-start-before-01092012: 'Yes' course-start-after-01092012: 'No' - - diff --git a/test/artefacts/student-finance-forms/uk-full-time.html b/test/artefacts/student-finance-forms/uk-full-time.html index c9af8e1b0d1..d5558014721 100644 --- a/test/artefacts/student-finance-forms/uk-full-time.html +++ b/test/artefacts/student-finance-forms/uk-full-time.html @@ -44,7 +44,7 @@

  • diff --git a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.html b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.html index f6d81a47e68..3492bdc5ede 100644 --- a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.html +++ b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants.html @@ -93,7 +93,7 @@

    What do you need the form for? - apply-loans-grants + Apply for student loans and grants diff --git a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1516.html b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1516.html index 214f4c4e4e9..49c51b26aa4 100644 --- a/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1516.html +++ b/test/artefacts/student-finance-forms/uk-full-time/apply-loans-grants/year-1516.html @@ -94,7 +94,7 @@

    What do you need the form for? - apply-loans-grants + Apply for student loans and grants diff --git a/test/data/student-finance-forms-files.yml b/test/data/student-finance-forms-files.yml index bda3c14a118..30d30124e10 100644 --- a/test/data/student-finance-forms-files.yml +++ b/test/data/student-finance-forms-files.yml @@ -1,6 +1,6 @@ --- lib/smart_answer_flows/student-finance-forms.rb: ba440a386aa4ebdf717e5a67f95869f2 -lib/smart_answer_flows/locales/en/student-finance-forms.yml: c171e62957dbe94cca7f6bb4aceb3b91 +lib/smart_answer_flows/locales/en/student-finance-forms.yml: 2ea8adb5e2808a8a3de5d95ac18f1326 test/data/student-finance-forms-questions-and-responses.yml: ec2ad38a9df75dd2606b9f979afd5066 test/data/student-finance-forms-responses-and-expected-results.yml: fb765941838abb1e05b2d874049c7db1 lib/smart_answer_flows/student-finance-forms/_circumstances_changed_co2_form.govspeak.erb: 236d81f3660a1958bb0dd3a8f229baf4