Convert simplified-expenses-checker to use ERB templates for questions #2149
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
|
Looks good to me. |
This results in more aesthetically pleasing HTML and should make it easier to convert the flow to use ERB templates for questions. I've updated the regression test artefacts and checksums accordingly.
I ran the following command:
$ rails r script/convert-question-i18-yaml-to-erb-templates.rb lib/smart_answer_flows/simplified-expenses-checker
Writing template: claimed_expenses_for_current_business.govspeak.erb
Writing template: type_of_expense.govspeak.erb
Writing template: buying_new_vehicle.govspeak.erb
Writing template: capital_allowances.govspeak.erb
Writing template: how_much_expect_to_claim.govspeak.erb
Writing template: is_vehicle_green.govspeak.erb
Writing template: price_of_vehicle.govspeak.erb
Writing template: vehicle_business_use_time.govspeak.erb
Writing template: drive_business_miles_car_van.govspeak.erb
Writing template: drive_business_miles_motorcycle.govspeak.erb
Writing template: current_claim_amount_home.govspeak.erb
Writing template: hours_work_home.govspeak.erb
Writing template: deduct_from_premises.govspeak.erb
Writing template: people_live_on_premises.govspeak.erb
Deleting i18n YAML: simplified-expenses-checker.yml
Now insert `use_erb_templates_for_questions` at top of flow: simplified-expenses-checker.rb
Since #2098 & #2112, apostrophes rendered via `SmartAnswer::ErbRenderer` have not been HTML-escaped. Now that we are rendering question content via this renderer, we need to update the regression test artefacts for question pages accordingly. I ran the following commands to do this: $ find test/artefacts/simplified-expenses-checker -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/simplified-expenses-checker/**/*.bak
The change to ERB templates has introduced a few extra newlines in the
question page HTML, but none of them affect the content viewable by the user.
I verified that the changes were all only blank lines using the following
command:
$ git diff --ignore-blank-lines
Re-generating the checksums has removed the i18n YAML file and added the new question templates as I expected.
chrisroos
force-pushed
the
convert-simplified-expenses-checker-to-use-erb-templates-for-questions
branch
from
347e7cc to
365fa31
Compare
|
I've rebased this on master and force pushed in preparation for merging. |
chrisroos
added a commit
that referenced
this pull request
Nov 19, 2015
…ecker-to-use-erb-templates-for-questions Convert simplified-expenses-checker to use ERB templates for questions
chrisroos
deleted the
convert-simplified-expenses-checker-to-use-erb-templates-for-questions
branch
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.
No description provided.