Skip to content

Commit 4b8a877

Browse files
committed
Unescape HTML-escaped apostrophes in regression test artefacts
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
1 parent 4c0cd52 commit 4b8a877

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

test/artefacts/calculate-married-couples-allowance/yes.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h2>
3737
<div class="question-body">
3838

3939

40-
<p class="hint">Before this date the husband&#39;s income is used to work out your allowance, after this date it&#39;s the income of the highest earner.</p>
40+
<p class="hint">Before this date the husband's income is used to work out your allowance, after this date it's the income of the highest earner.</p>
4141

4242
<div class="">
4343

test/artefacts/calculate-married-couples-allowance/yes/no.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1>
3232
<div class="current-question" id="current-question">
3333
<div class="question">
3434
<h2>
35-
What&#39;s the highest earner&#39;s date of birth?
35+
What's the highest earner's date of birth?
3636
</h2>
3737
<div class="question-body">
3838

test/artefacts/calculate-married-couples-allowance/yes/no/1955-01-01.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ <h1>
3232
<div class="current-question" id="current-question">
3333
<div class="question">
3434
<h2>
35-
What&#39;s the highest earner&#39;s yearly income?
35+
What's the highest earner's yearly income?
3636
</h2>
3737
<div class="question-body">
3838

3939

40-
<p class="hint">Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer&#39;s Allowance.</p>
40+
<p class="hint">Add up your taxable income, eg earnings, pensions and any taxable benefits, eg Carer's Allowance.</p>
4141

4242
<div class="">
4343

@@ -91,13 +91,13 @@ <h3 class="previous-answers-title">
9191

9292

9393
<tr class="section">
94-
<td class="previous-question-title">What&#39;s the highest earner&#39;s date of birth?</td>
94+
<td class="previous-question-title">What's the highest earner's date of birth?</td>
9595
<td class="previous-question-body">
9696
1 January 1955</td>
9797

9898
<td class="link-right">
9999
<a href="/calculate-married-couples-allowance/y/yes/no?previous_response=1955-01-01">
100-
Change<span class="visuallyhidden"> answer to "What&#39;s the highest earner&#39;s date of birth?"</span>
100+
Change<span class="visuallyhidden"> answer to "What's the highest earner's date of birth?"</span>
101101
</a> </td>
102102
</tr>
103103

test/artefacts/calculate-married-couples-allowance/yes/yes.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1>
3232
<div class="current-question" id="current-question">
3333
<div class="question">
3434
<h2>
35-
What&#39;s the husband&#39;s date of birth?
35+
What's the husband's date of birth?
3636
</h2>
3737
<div class="question-body">
3838

test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1>
3232
<div class="current-question" id="current-question">
3333
<div class="question">
3434
<h2>
35-
What&#39;s the husband&#39;s yearly income?
35+
What's the husband's yearly income?
3636
</h2>
3737
<div class="question-body">
3838

@@ -91,13 +91,13 @@ <h3 class="previous-answers-title">
9191

9292

9393
<tr class="section">
94-
<td class="previous-question-title">What&#39;s the husband&#39;s date of birth?</td>
94+
<td class="previous-question-title">What's the husband's date of birth?</td>
9595
<td class="previous-question-body">
9696
1 January 1950</td>
9797

9898
<td class="link-right">
9999
<a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
100-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s date of birth?"</span>
100+
Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
101101
</a> </td>
102102
</tr>
103103

test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27001.0/yes.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,25 +97,25 @@ <h3 class="previous-answers-title">
9797

9898

9999
<tr class="section">
100-
<td class="previous-question-title">What&#39;s the husband&#39;s date of birth?</td>
100+
<td class="previous-question-title">What's the husband's date of birth?</td>
101101
<td class="previous-question-body">
102102
1 January 1950</td>
103103

104104
<td class="link-right">
105105
<a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
106-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s date of birth?"</span>
106+
Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
107107
</a> </td>
108108
</tr>
109109

110110

111111
<tr class="section">
112-
<td class="previous-question-title">What&#39;s the husband&#39;s yearly income?</td>
112+
<td class="previous-question-title">What's the husband's yearly income?</td>
113113
<td class="previous-question-body">
114114
£27,001</td>
115115

116116
<td class="link-right">
117117
<a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27001.0">
118-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s yearly income?"</span>
118+
Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
119119
</a> </td>
120120
</tr>
121121

test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27001.0/yes/10000.0/5000.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,25 +91,25 @@ <h3 class="previous-answers-title">
9191

9292

9393
<tr class="section">
94-
<td class="previous-question-title">What&#39;s the husband&#39;s date of birth?</td>
94+
<td class="previous-question-title">What's the husband's date of birth?</td>
9595
<td class="previous-question-body">
9696
1 January 1950</td>
9797

9898
<td class="link-right">
9999
<a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
100-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s date of birth?"</span>
100+
Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
101101
</a> </td>
102102
</tr>
103103

104104

105105
<tr class="section">
106-
<td class="previous-question-title">What&#39;s the husband&#39;s yearly income?</td>
106+
<td class="previous-question-title">What's the husband's yearly income?</td>
107107
<td class="previous-question-body">
108108
£27,001</td>
109109

110110
<td class="link-right">
111111
<a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27001.0">
112-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s yearly income?"</span>
112+
Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
113113
</a> </td>
114114
</tr>
115115

test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27001.0/yes/10000.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,25 +91,25 @@ <h3 class="previous-answers-title">
9191

9292

9393
<tr class="section">
94-
<td class="previous-question-title">What&#39;s the husband&#39;s date of birth?</td>
94+
<td class="previous-question-title">What's the husband's date of birth?</td>
9595
<td class="previous-question-body">
9696
1 January 1950</td>
9797

9898
<td class="link-right">
9999
<a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
100-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s date of birth?"</span>
100+
Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
101101
</a> </td>
102102
</tr>
103103

104104

105105
<tr class="section">
106-
<td class="previous-question-title">What&#39;s the husband&#39;s yearly income?</td>
106+
<td class="previous-question-title">What's the husband's yearly income?</td>
107107
<td class="previous-question-body">
108108
£27,001</td>
109109

110110
<td class="link-right">
111111
<a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27001.0">
112-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s yearly income?"</span>
112+
Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
113113
</a> </td>
114114
</tr>
115115

test/artefacts/calculate-married-couples-allowance/yes/yes/1950-01-01/27001.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,25 +103,25 @@ <h3 class="previous-answers-title">
103103

104104

105105
<tr class="section">
106-
<td class="previous-question-title">What&#39;s the husband&#39;s date of birth?</td>
106+
<td class="previous-question-title">What's the husband's date of birth?</td>
107107
<td class="previous-question-body">
108108
1 January 1950</td>
109109

110110
<td class="link-right">
111111
<a href="/calculate-married-couples-allowance/y/yes/yes?previous_response=1950-01-01">
112-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s date of birth?"</span>
112+
Change<span class="visuallyhidden"> answer to "What's the husband's date of birth?"</span>
113113
</a> </td>
114114
</tr>
115115

116116

117117
<tr class="section">
118-
<td class="previous-question-title">What&#39;s the husband&#39;s yearly income?</td>
118+
<td class="previous-question-title">What's the husband's yearly income?</td>
119119
<td class="previous-question-body">
120120
£27,001</td>
121121

122122
<td class="link-right">
123123
<a href="/calculate-married-couples-allowance/y/yes/yes/1950-01-01?previous_response=27001.0">
124-
Change<span class="visuallyhidden"> answer to "What&#39;s the husband&#39;s yearly income?"</span>
124+
Change<span class="visuallyhidden"> answer to "What's the husband's yearly income?"</span>
125125
</a> </td>
126126
</tr>
127127

0 commit comments

Comments
 (0)