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

Fix FlowRegistrationPresenter to work with both i18n & ERB #2138

Merged
merged 1 commit into from
Nov 19, 2015

Conversation

floehopper
Copy link
Contributor

In #2103 I forgot that we still need to support flows/questions with their
content in i18n YAML files vs ERB templates.

In this commit I've renamed the FlowRegistrationPresenterTest to
FlowRegistrationPresenterWithErbRendererTest and reinstated the earlier
version of FlowRegistrationPresenterTest to give suitable test coverage.

I've also reinstated the two i18n YAML files and use an explicit call to
Flow#use_erb_templates_for_questions in
FlowRegistrationPresenterWithErbRendererTest to switch over to ERB rendering.

Finally I've also reinstated the handling of
I18n::MissingInterpolationArgument so that the tests all pass.

Note that we saw an exception in preview which alerted me to this problem.

@chrisroos
Copy link
Contributor

Looks good to me.

@chrisroos chrisroos added the LGTM label Nov 19, 2015
@chrisroos chrisroos self-assigned this Nov 19, 2015
In #2103 I forgot that we still need to support flows/questions with their
content in i18n YAML files vs ERB templates.

In this commit I've renamed the `FlowRegistrationPresenterTest` to
`FlowRegistrationPresenterWithErbRendererTest` and reinstated the earlier
version of `FlowRegistrationPresenterTest` to give suitable test coverage.

I've also reinstated the two i18n YAML files and use an explicit call to
`Flow#use_erb_templates_for_questions` in
`FlowRegistrationPresenterWithErbRendererTest` to switch over to ERB rendering.

Finally I've also reinstated the handling of
`I18n::MissingInterpolationArgument` so that the tests all pass.
@floehopper floehopper force-pushed the fix-flow-registration-presenter branch from cc24439 to 2b1ae94 Compare November 19, 2015 12:56
@floehopper
Copy link
Contributor Author

I've rebased this against master and force-pushed in preparation for merging.

floehopper added a commit that referenced this pull request Nov 19, 2015
Fix FlowRegistrationPresenter to work with both i18n & ERB
@floehopper floehopper merged commit 1e14181 into master Nov 19, 2015
@floehopper floehopper deleted the fix-flow-registration-presenter branch November 19, 2015 13:04
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.

2 participants