Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert state-pension-through-partner to use ERB templates for questions #2150

Merged
merged 4 commits into from
Nov 19, 2015
Merged

Convert state-pension-through-partner to use ERB templates for questions #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a332ae8
Use ERB templates for Qs in state-pension-through-partner
floehopper Nov 19, 2015
b1cb101
Now insert use_erb_templates_for_questions at top of flow
floehopper Nov 19, 2015
01be641
Update regression test artefacts
floehopper Nov 19, 2015
6124b29
Update regression test checksums
floehopper Nov 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions lib/smart_answer_flows/locales/en/state-pension-through-partner.yml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions lib/smart_answer_flows/state-pension-through-partner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ def define
status :published
satisfies_need "100578"

use_erb_templates_for_questions

### This will need updating before 6th April 2016 ###
# Q1
multiple_choice :what_is_your_marital_status? do
Expand Down
8 changes: 8 additions & 0 deletions ...art_answer_flows/state-pension-through-partner/questions/what_is_your_gender.govspeak.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<% content_for :title do %>
Are you:
<% end %>

<% options(
"male_gender": "a man",
"female_gender": "a woman"
) %>
11 changes: 11 additions & 0 deletions ...er_flows/state-pension-through-partner/questions/what_is_your_marital_status.govspeak.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<% content_for :title do %>
What is your marital status?
<% end %>

<% options(
"married": "married or in a civil partnership",
"will_marry_before_specific_date": "I’ll be married or in a civil partnership before 5 April 2016",
"will_marry_on_or_after_specific_date": "I’ll be married or in a civil partnership after 6 April 2016",
"widowed": "widowed",
"divorced": "divorced or have dissolved your civil partnership"
) %>
8 changes: 8 additions & 0 deletions ...lows/state-pension-through-partner/questions/when_will_you_reach_pension_age.govspeak.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<% content_for :title do %>
When will you reach State Pension age?
<% end %>

<% options(
"your_pension_age_before_specific_date": "on or before 5 April 2016",
"your_pension_age_after_specific_date": "on or after 6 April 2016"
) %>
8 changes: 8 additions & 0 deletions ...e-pension-through-partner/questions/when_will_your_partner_reach_pension_age.govspeak.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<% content_for :title do %>
When will your spouse or civil partner reach State Pension age?
<% end %>

<% options(
"partner_pension_age_before_specific_date": "on or before 5 April 2016",
"partner_pension_age_after_specific_date": "on or after 6 April 2016"
) %>
2 changes: 2 additions & 0 deletions test/artefacts/state-pension-through-partner/married.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ <h2>




<div class="">

<ul class="options">
Expand All @@ -57,6 +58,7 @@ <h2>




</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions ...arried/your_pension_age_after_specific_date/partner_pension_age_before_specific_date.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ <h2>




<div class="">

<ul class="options">
Expand All @@ -57,6 +58,7 @@ <h2>




</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions ...rtefacts/state-pension-through-partner/married/your_pension_age_before_specific_date.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ <h2>




<div class="">

<ul class="options">
Expand All @@ -57,6 +58,7 @@ <h2>




</div>
</div>
</div>
Expand Down
2 changes: 2 additions & 0 deletions test/artefacts/state-pension-through-partner/y.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ <h2>




<div class="">

<ul class="options">
Expand Down Expand Up @@ -75,6 +76,7 @@ <h2>




</div>
</div>
</div>
Expand Down
7 changes: 5 additions & 2 deletions test/data/state-pension-through-partner-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
lib/smart_answer_flows/state-pension-through-partner.rb: 99a9aa83c13664ec84c520b22114a493
lib/smart_answer_flows/locales/en/state-pension-through-partner.yml: dfdbbb39e4d2582046a61a98e9c4ba1c
lib/smart_answer_flows/state-pension-through-partner.rb: 2ab7edfc0a911e8fbd870d2eee03d046
test/data/state-pension-through-partner-questions-and-responses.yml: 256f0f1136d388a674a0732173da6c1a
test/data/state-pension-through-partner-responses-and-expected-results.yml: fcf56e5687c592c8693f62f529bc939e
lib/smart_answer_flows/state-pension-through-partner/outcomes/_increase_retirement_income.govspeak.erb: 2391bf6e80d1aa4d0d4258030b4f4e00
Expand All @@ -13,5 +12,9 @@ lib/smart_answer_flows/state-pension-through-partner/outcomes/impossibility_to_i
lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_and_state_pension_outcome.govspeak.erb: 3bac717478181c284be2c91a98a222b3
lib/smart_answer_flows/state-pension-through-partner/outcomes/married_woman_no_state_pension_outcome.govspeak.erb: dbad81e6c8fd6dd637eaccbfe26c879d
lib/smart_answer_flows/state-pension-through-partner/outcomes/widow_and_old_pension_outcome.govspeak.erb: 9a71f07507d6a0a45130b46fb329602d
lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_gender.govspeak.erb: c349baf18577431bd5f5ccf31e4b76bb
lib/smart_answer_flows/state-pension-through-partner/questions/what_is_your_marital_status.govspeak.erb: 86b0f4cdedffd735114360c21248ff05
lib/smart_answer_flows/state-pension-through-partner/questions/when_will_you_reach_pension_age.govspeak.erb: 91c30ae0ee8202f5725fcf71f476babf
lib/smart_answer_flows/state-pension-through-partner/questions/when_will_your_partner_reach_pension_age.govspeak.erb: d2f06f49adaa0f29f0c3ae9438dd55c7
lib/smart_answer_flows/state-pension-through-partner/state_pension_through_partner.govspeak.erb: a88c54040e00a71034f75b10a5077137
lib/data/rates/state_pension.yml: 7e97e88500fb698038c49332b48b82bf