Skip to content

Commit a25755f

Browse files
Move tests alongside files
1 parent b035378 commit a25755f

15 files changed

+16
-14
lines changed

jest.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,14 @@ module.exports = {
1818
{
1919
displayName: 'JSDom',
2020
testEnvironment: 'jsdom',
21-
testMatch: ['<rootDir>/tests/integration/jsdom/**/*.test.js']
21+
testMatch: ['<rootDir>/**/*.jsdom.test.{js,mjs}']
2222
},
2323
{
2424
displayName: 'Pupppeteer',
2525
globalSetup: 'jest-environment-puppeteer/setup',
26-
globalTeardown:
27-
'<rootDir>/tests/integration/puppeteer/environment/teardown.mjs',
26+
globalTeardown: '<rootDir>/shared/helpers/jest/browser/close.mjs',
2827
testEnvironment: 'jest-environment-puppeteer',
29-
testMatch: ['<rootDir>/tests/integration/puppeteer/**/*.test.js']
28+
testMatch: ['<rootDir>/**/*.puppeteer.test.{js,mjs}']
3029
}
3130
],
3231

package-lock.json

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/nhsuk-frontend/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
"package.json",
1717
"README.md"
1818
],
19+
"devDependencies": {
20+
"puppeteer": "^24.6.0"
21+
},
1922
"engines": {
2023
"node": "^20.9.0 || ^22.11.0"
2124
}

tests/integration/jsdom/common.test.js renamed to packages/nhsuk-frontend/src/nhsuk/common.jsdom.test.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
toggleAttribute,
3-
toggleConditionalInput
4-
} from '../../../packages/nhsuk-frontend/src/nhsuk/common.js'
1+
import { toggleAttribute, toggleConditionalInput } from './common.js'
52

63
describe('toggleAttribute util', () => {
74
const attr = 'test-attribute'

tests/integration/jsdom/button.test.js renamed to packages/nhsuk-frontend/src/nhsuk/components/button/button.jsdom.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Button from '../../../packages/nhsuk-frontend/src/nhsuk/components/button/button.js'
1+
import Button from './button.js'
22

33
describe('mis-instantiation', () => {
44
it('does not prevent further JavaScript from running', async () => {

tests/integration/jsdom/checkboxes.test.js renamed to packages/nhsuk-frontend/src/nhsuk/components/checkboxes/checkboxes.jsdom.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Checkboxes from '../../../packages/nhsuk-frontend/src/nhsuk/components/checkboxes/checkboxes.js'
1+
import Checkboxes from './checkboxes.js'
22

33
describe('Checkboxes module', () => {
44
describe('does not throw an error', () => {

tests/integration/jsdom/error-summary.test.js renamed to packages/nhsuk-frontend/src/nhsuk/components/error-summary/error-summary.jsdom.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ErrorSummary from '../../../packages/nhsuk-frontend/src/nhsuk/components/error-summary/error-summary.js'
1+
import ErrorSummary from './error-summary.js'
22

33
describe('Error summary module', () => {
44
describe('if no error summary elements exists', () => {

tests/integration/jsdom/header.test.js renamed to packages/nhsuk-frontend/src/nhsuk/components/header/header.jsdom.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Header from '../../../packages/nhsuk-frontend/src/nhsuk/components/header/header.js'
1+
import Header from './header.js'
22

33
describe('Header class', () => {
44
beforeEach(() => {

tests/integration/jsdom/radios.test.js renamed to packages/nhsuk-frontend/src/nhsuk/components/radios/radios.jsdom.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Radios from '../../../packages/nhsuk-frontend/src/nhsuk/components/radios/radios.js'
1+
import Radios from './radios.js'
22

33
describe('Radios module', () => {
44
describe('does not throw an error', () => {

tests/integration/jsdom/skip-link.test.js renamed to packages/nhsuk-frontend/src/nhsuk/components/skip-link/skip-link.jsdom.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import SkipLink from '../../../packages/nhsuk-frontend/src/nhsuk/components/skip-link/skip-link.js'
1+
import SkipLink from './skip-link.js'
22

33
// Mock HTML
44
const skipLinkHtml =

0 commit comments

Comments
 (0)