Convert am-i-getting-minimum-wage to use ERB templates for questions #2114
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. |
I ran the following command:
$ rails r script/convert-question-i18-yaml-to-erb-templates.rb lib/smart_answer_flows/am-i-getting-minimum-wage
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/am-i-getting-minimum-wage -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/am-i-getting-minimum-wage/**/*.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 used the following command to hide these changes:
$ git diff --ignore-blank-lines
The change to ERB templates has also removed the trailing newline for question
attributes which were using a `|`-prefixed multi-line YAML string. Even though
the newline has been reproduced faithfully in the corresponding ERB template, it
has been lost by one/both of the calls to `ErbRenderer#normalize_blank_lines`
and/or `String#chomp`.
I feel as if the resulting HTML is actually cleaner and so I'm happy to update
the regression test artefacts accordingly.
Re-generating the checksums has removed the i18n YAML file and added the new question templates as I expected.
floehopper
force-pushed
the
convert-am-i-getting-minimum-wage-to-use-erb-templates-for-questions
branch
from
979e6cb to
dfd7fab
Compare
floehopper
added a commit
that referenced
this pull request
Nov 18, 2015
…age-to-use-erb-templates-for-questions Convert am-i-getting-minimum-wage to use ERB templates for questions
floehopper
deleted the
convert-am-i-getting-minimum-wage-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.