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

Add error message tests #507

Merged
merged 4 commits into from
Feb 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ Internal:
- Add tests for panel component (PR [#500](https://github.com/alphagov/govuk-frontend/pull/500))
- Add tests for skip-link component (PR [#498](https://github.com/alphagov/govuk-frontend/pull/498))
- Add tests for file-upload component (PR [#504](https://github.com/alphagov/govuk-frontend/pull/504))
- Add tests for error-message component (PR [#507](https://github.com/alphagov/govuk-frontend/pull/507))

## 0.0.22-alpha (Breaking release)

Expand Down
10 changes: 5 additions & 5 deletions src/components/date-input/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ More information about when to use date-input can be found on [GOV.UK Design Sys
<span class="govuk-c-fieldset__hint">For example, 31 3 1980</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</legend>
Expand Down Expand Up @@ -97,7 +97,7 @@ More information about when to use date-input can be found on [GOV.UK Design Sys
<span class="govuk-c-fieldset__hint">For example, 31 3 1980</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</legend>
Expand Down Expand Up @@ -172,7 +172,7 @@ More information about when to use date-input can be found on [GOV.UK Design Sys
<span class="govuk-c-fieldset__hint">For example, 31 3 1980</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</legend>
Expand Down Expand Up @@ -246,7 +246,7 @@ More information about when to use date-input can be found on [GOV.UK Design Sys
<span class="govuk-c-fieldset__hint">For example, 31 3 1980</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</legend>
Expand Down Expand Up @@ -320,7 +320,7 @@ More information about when to use date-input can be found on [GOV.UK Design Sys
<span class="govuk-c-fieldset__hint">For example, 31 3 1980</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</legend>
Expand Down
2 changes: 1 addition & 1 deletion src/components/error-message/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ More information about when to use error-message can be found on [GOV.UK Design
#### Markup

<span class="govuk-c-error-message">
Error message about full name goes here
Error message about full name goes here
</span>

#### Macro
Expand Down
2 changes: 1 addition & 1 deletion src/components/error-message/template.njk
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<span class="govuk-c-error-message{%- if params.classes %} {{ params.classes }}{% endif %}"{% for attribute, value in params.attributes %} {{attribute}}="{{value}}"{% endfor %}>
{{ params.html | safe if params.html else params.text }}
{{ params.html | safe if params.html else params.text }}
</span>
45 changes: 45 additions & 0 deletions src/components/error-message/template.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/* globals describe, it, expect */

const { render } = require('../../../lib/jest-helpers')

describe('Error message', () => {
it('allows additional classes to specified', () => {
const $ = render('error-message', {
classes: 'custom-class'
})

const $component = $('.govuk-c-error-message')
expect($component.hasClass('custom-class')).toBeTruthy()
})

it('allows text to be passed whilst escaping HTML entities', () => {
const $ = render('error-message', {
text: 'Unexpected > in body'
})

const content = $('.govuk-c-error-message').html().trim()
expect(content).toEqual('Unexpected &gt; in body')
})

it('allows summary HTML to be passed un-escaped', () => {
const $ = render('error-message', {
html: 'Unexpected <b>bold text</b> in body copy'
})

const content = $('.govuk-c-error-message').html().trim()
expect(content).toEqual('Unexpected <b>bold text</b> in body copy')
})

it('allows additional attributes to be specified', () => {
const $ = render('error-message', {
attributes: {
'data-test': 'attribute',
'id': 'my-error-message'
}
})

const $component = $('.govuk-c-error-message')
expect($component.attr('data-test')).toEqual('attribute')
expect($component.attr('id')).toEqual('my-error-message')
})
})
4 changes: 2 additions & 2 deletions src/components/fieldset/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ More information about when to use fieldset can be found on [GOV.UK Design Syste
<span class="govuk-c-fieldset__hint">Legend hint text goes here</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</legend>
Expand Down Expand Up @@ -79,7 +79,7 @@ More information about when to use fieldset can be found on [GOV.UK Design Syste
<span class="govuk-c-fieldset__hint">Legend hint text <i>goes</i> here</span>

<span class="govuk-c-error-message">
Error message <i>goes</i> here
Error message <i>goes</i> here
</span>

</legend>
Expand Down
2 changes: 1 addition & 1 deletion src/components/file-upload/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ More information about when to use file-upload can be found on [GOV.UK Design Sy
</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</label>
Expand Down
2 changes: 1 addition & 1 deletion src/components/input/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ More information about when to use input can be found on [GOV.UK Design System](
</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</label>
Expand Down
2 changes: 1 addition & 1 deletion src/components/label/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ More information about when to use label can be found on [GOV.UK Design System](
</span>

<span class="govuk-c-error-message">
Error message goes here
Error message goes here
</span>

</label>
Expand Down
2 changes: 1 addition & 1 deletion src/components/radios/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ More information about when to use radios can be found on [GOV.UK Design System]
<span class="govuk-c-fieldset__hint">This includes changing your last name or spelling your name differently.</span>

<span class="govuk-c-error-message">
Please select an option
Please select an option
</span>

</legend>
Expand Down
12 changes: 6 additions & 6 deletions src/components/select/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ More information about when to use select can be found on [GOV.UK Design System]
#### Markup

<label class="govuk-c-label" for="select-2">
Label text <i>goes</i> here
Label text goes here

<span class="govuk-c-label__hint">
Hint message <i>goes</i> here
Hint text goes here
</span>

<span class="govuk-c-error-message">
<i>Error message goes here</i>
Error message goes here
</span>

</label>
Expand All @@ -90,11 +90,11 @@ More information about when to use select can be found on [GOV.UK Design System]
"id": "select-2",
"name": "select-2",
"label": {
"hintHtml": "Hint message <i>goes</i> here",
"html": "Label text <i>goes</i> here"
"hintText": "Hint text goes here",
"text": "Label text goes here"
},
"errorMessage": {
"html": "<i>Error message goes here</i>"
"text": "Error message goes here"
},
"items": [
{
Expand Down
6 changes: 3 additions & 3 deletions src/components/select/select.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ examples:
id: select-2
name: select-2
label:
hintHtml: Hint message <i>goes</i> here
html: Label text <i>goes</i> here
hintText: Hint text goes here
text: Label text goes here
errorMessage:
html: <i>Error message goes here</i>
text: Error message goes here
items:
-
value: 1
Expand Down
2 changes: 1 addition & 1 deletion src/components/textarea/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ More information about when to use textarea can be found on [GOV.UK Design Syste
Why can&#39;t you provide a National Insurance number?

<span class="govuk-c-error-message">
You must provide an explanation
You must provide an explanation
</span>

</label>
Expand Down