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.

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

Add missing phrase for maternity-paternity-calculator #1835

Merged

Conversation

chrisroos
Copy link
Contributor

The text was supplied by @lutgendorff.

This replaces the "adoption_spp_claim_link" placeholder with a useful phrase.

Expected changes

  • Example URL
    • Added paragraph about latest date for claiming SAP.

Before

1-before

After

2-after

@chrisroos
Copy link
Contributor Author

NOTE. Liz is going to check this wording with the department. If/when we get the OK, I'll update the regression test file checksums and artefacts.

@chrisroos chrisroos force-pushed the add-missing-phrase-for-maternity-paternity-calculator branch from 659aae3 to 9b35463 Compare July 23, 2015 11:15
@chrisroos
Copy link
Contributor Author

I've rebased this branch on master and updated it now that maternity-paternity-calculator uses ERB templates.

I've force pushed this branch.

@tadast
Copy link
Contributor

tadast commented Jul 23, 2015

LGTM but it looks like you'll need to rebase again

@chrisroos chrisroos force-pushed the add-missing-phrase-for-maternity-paternity-calculator branch from 9b35463 to 2389d28 Compare July 23, 2015 16:25
@chrisroos
Copy link
Contributor Author

I've rebased on top of master and force pushed now that the ERB templates are indented.

@tadast
Copy link
Contributor

tadast commented Jul 30, 2015

:shipit: :shipit: :shipit:

@chrisroos
Copy link
Contributor Author

@tadast: Did you hear from Liz that this is OK to deploy?

@floehopper
Copy link
Contributor

@tadast: Bump! Did you hear from Liz that the wording has been approved?

@tadast
Copy link
Contributor

tadast commented Aug 10, 2015

Initially I thought it's good to go but I must've confused it with something else. Liz hasn't heard back yet for this change unfortunately.

@chrisroos chrisroos force-pushed the add-missing-phrase-for-maternity-paternity-calculator branch from 2389d28 to 7528ba8 Compare August 25, 2015 16:06
@chrisroos
Copy link
Contributor Author

I've just rebased and force pushed this branch.

@lutgendorff: Have you heard anything back from the department about this change?

@chrisroos chrisroos force-pushed the add-missing-phrase-for-maternity-paternity-calculator branch from 7528ba8 to 2a831d1 Compare September 21, 2015 14:57
@chrisroos
Copy link
Contributor Author

I've just rebased and force pushed this branch again.

@chrisroos chrisroos force-pushed the add-missing-phrase-for-maternity-paternity-calculator branch from 2a831d1 to 6f3debf Compare October 12, 2015 11:23
@chrisroos
Copy link
Contributor Author

I've rebased and force-pushed this branch. One thing to note is that the message for paternity adoption has recently been changed to mention "15 days" while our new adoption message mentions "28 days". I wonder whether these should be the same.

@chrisroos
Copy link
Contributor Author

Liz has said that we should update the text to use "15 days" instead of "28 days" and then to get this deployed. I'm going to make the change and get this merged.

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
Updated using:

    $ rails r script/generate-checksums-for-smart-answer.rb \
      maternity-paternity-calculator
Updated using:

    $ time RUN_REGRESSION_TESTS=maternity-paternity-calculator \
      ruby test/regression/smart_answers_regression_test.rb
@chrisroos chrisroos force-pushed the add-missing-phrase-for-maternity-paternity-calculator branch from 6f3debf to 931b851 Compare October 12, 2015 12:19
chrisroos added a commit that referenced this pull request Oct 12, 2015
…ty-paternity-calculator

Add missing phrase for maternity-paternity-calculator
@chrisroos chrisroos merged commit 17bdc4c into master Oct 12, 2015
@chrisroos chrisroos deleted the add-missing-phrase-for-maternity-paternity-calculator branch October 12, 2015 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants