Calculate state pension start page amendments #1995
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I plan to merge these changes if/when the tests pass. |
|
Oh, I see. I kept losing the first commit when I struggled with the merge/revert/fix typos changes dance as well. Thanks! |
Need a preview link.
Fix typos and consistently use smart quotes. This was originally committed by @issyl0 but I've updated it to separately generate the checksum data and test artefacts.
I sat with @lutgendorff to make these changes, based on feedback from the department.
Updated using:
$ rails r script/generate-checksums-for-smart-answer.rb \
calculate-state-pension
Using:
$ RUN_REGRESSION_TESTS=calculate-state-pension \
ruby test/regression/smart_answers_regression_test.rb
chrisroos
force-pushed
the
calculate-state-pension-start-page-amendments
branch
from
0f42329 to
71bc6ac
Compare
chrisroos
added a commit
that referenced
this pull request
Oct 12, 2015
…page-amendments Calculate state pension start page amendments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This replaces #1991.
I created a new branch because I was struggling to rebase the old branch on master. I kept losing the first commit ("Amend Calculate State Pension start page to reflect 55 years + outcomes"). My best guess is that this is because it had been merged to master and then reverted, although I can't be sure about that.
Expected changes
Before
After