ErbRenderer should always return HTML-safe string for option labels #2112

floehopper · 2015-11-18T12:19:35Z

The option label text is all provided by developers; none of it is supplied by external users. This means we can legitimately mark all option label text as HTML-safe. c.f. #2098

There's no need to update any regression test artefacts, because this change only affects the options in question pages and these are all currently rendered by the I18nRenderer.

This is unrelated to the other changes in this PR, but I thought I'd take the opportunity to fix it anyway.

The option label text is all provided by developers; none of it is supplied by external users. This means we can legitimately mark all option label text as HTML-safe. c.f. a5abd6c

chrisroos · 2015-11-18T12:25:09Z

Looks good to me.

…urn-html-safe-string-for-option-labels ErbRenderer should always return HTML-safe string for option labels

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/benefit-cap-calculator -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/benefit-cap-calculator/**/*.bak

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

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/benefit-cap-calculator -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/benefit-cap-calculator/**/*.bak

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/calculate-married-couples-allowance -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/calculate-married-couples-allowance/**/*.bak

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/calculate-your-child-maintenance -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/calculate-your-child-maintenance/**/*.bak

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/benefit-cap-calculator -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/benefit-cap-calculator/**/*.bak

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

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/calculate-married-couples-allowance -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/calculate-married-couples-allowance/**/*.bak

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/calculate-your-holiday-entitlement -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/calculate-your-holiday-entitlement/**/*.bak

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/check-uk-visa -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/check-uk-visa/**/*.bak

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/childcare-costs-for-tax-credits -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/childcare-costs-for-tax-credits/**/*.bak

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/estimate-self-assessment-penalties -name '*.html' | xargs sed -i .bak "s/&/\&/g" $ git clean -fd test/artefacts/**/*.bak

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/inherits-someone-dies-without-will -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/inherits-someone-dies-without-will/**/*.bak

Since #2098 & #2112, ampersands rendered via `SmartAnswer::ErbRenderer` have not been HTML-escaped. Now that we are rendering question content via this renderer, we need to update the content in the ERB template to use the HTML entity for ampersand.

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/pip-checker -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/pip-checker/**/*.bak

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/plan-adoption-leave -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/plan-adoption-leave/**/*.bak

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

Since #2098 & #2112, ampersands rendered via `SmartAnswer::ErbRenderer` have not been HTML-escaped. Now that we are rendering question content via this renderer, we need to update the content in the ERB template to use the HTML entity for ampersand.

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/student-finance-calculator -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/student-finance-calculator/**/*.bak

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/calculate-your-child-maintenance -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/calculate-your-child-maintenance/**/*.bak

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/calculate-your-holiday-entitlement -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/calculate-your-holiday-entitlement/**/*.bak

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/check-uk-visa -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/check-uk-visa/**/*.bak

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/childcare-costs-for-tax-credits -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/childcare-costs-for-tax-credits/**/*.bak

Since #2098 & #2112, ampersands rendered via `SmartAnswer::ErbRenderer` have not been HTML-escaped. Now that we are rendering question content via this renderer, we need to update the content in the ERB template to use the HTML entity for ampersand.

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/uk-benefits-abroad -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/uk-benefits-abroad/**/*.bak

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/inherits-someone-dies-without-will -name '*.html' | xargs sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/inherits-someone-dies-without-will/**/*.bak

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/uk-benefits-abroad -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/uk-benefits-abroad/**/*.bak

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/pip-checker -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/pip-checker/**/*.bak

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/plan-adoption-leave -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/plan-adoption-leave/**/*.bak

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

Since #2098 & #2112, ampersands rendered via `SmartAnswer::ErbRenderer` have not been HTML-escaped. Now that we are rendering question content via this renderer, we need to update the content in the ERB template to use the HTML entity for ampersand.

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/maternity-paternity-calculator -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/maternity-paternity-calculator/**/*.bak

Since #2098 & #2112, double-quotes 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/maternity-paternity-calculator -name '*.html' -print0 | xargs -0 sed -i .bak "s/"/\"/g" $ git clean -fd test/artefacts/maternity-paternity-calculator/**/*.bak

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/student-finance-calculator -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/student-finance-calculator/**/*.bak

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/uk-benefits-abroad -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/uk-benefits-abroad/**/*.bak

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/maternity-paternity-calculator -name '*.html' -print0 | xargs -0 sed -i .bak "s/'/'/g" $ git clean -fd test/artefacts/maternity-paternity-calculator/**/*.bak

Since #2098 & #2112, double-quotes 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/maternity-paternity-calculator -name '*.html' -print0 | xargs -0 sed -i .bak "s/"/\"/g" $ git clean -fd test/artefacts/maternity-paternity-calculator/**/*.bak

floehopper added 2 commits November 18, 2015 12:10

Fix typo in test name

b47603f

This is unrelated to the other changes in this PR, but I thought I'd take the opportunity to fix it anyway.

ErbRenderer#option_text should always return HTML-safe string

37c5411

The option label text is all provided by developers; none of it is supplied by external users. This means we can legitimately mark all option label text as HTML-safe. c.f. a5abd6c

chrisroos added the LGTM label Nov 18, 2015

floehopper added a commit that referenced this pull request Nov 18, 2015

Merge pull request #2112 from alphagov/erb-renderer-should-always-ret…

e7c254f

…urn-html-safe-string-for-option-labels ErbRenderer should always return HTML-safe string for option labels

floehopper merged commit e7c254f into master Nov 18, 2015

floehopper deleted the erb-renderer-should-always-return-html-safe-string-for-option-labels branch November 18, 2015 12:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ErbRenderer should always return HTML-safe string for option labels #2112

ErbRenderer should always return HTML-safe string for option labels #2112

floehopper commented Nov 18, 2015

chrisroos commented Nov 18, 2015

ErbRenderer should always return HTML-safe string for option labels #2112

ErbRenderer should always return HTML-safe string for option labels #2112

Conversation

floehopper commented Nov 18, 2015

chrisroos commented Nov 18, 2015