mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-26 01:04:00 -04:00
Move setup/teardown out of tests
This commit is contained in:
committed by
Chris Hill-Scott
parent
435334ba9c
commit
0131f0c1b1
@@ -6,7 +6,7 @@
|
|||||||
"node": "10.15.3"
|
"node": "10.15.3"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "gulp lint && jest tests/javascripts",
|
"test": "gulp lint && jest --config tests/javascripts/jest.config.js tests/javascripts",
|
||||||
"build": "gulp",
|
"build": "gulp",
|
||||||
"watch": "gulp watch"
|
"watch": "gulp watch"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,18 +1,9 @@
|
|||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
// set up jQuery
|
|
||||||
window.jQuery = require('jquery');
|
|
||||||
$ = window.jQuery;
|
|
||||||
|
|
||||||
// load module code
|
|
||||||
require('govuk_frontend_toolkit/javascripts/govuk/modules.js');
|
|
||||||
require('../../app/assets/javascripts/autofocus.js');
|
require('../../app/assets/javascripts/autofocus.js');
|
||||||
});
|
});
|
||||||
|
|
||||||
afterAll(() => {
|
afterAll(() => {
|
||||||
window.jQuery = null;
|
require('./support/teardown.js');
|
||||||
$ = null;
|
|
||||||
|
|
||||||
delete window.GOVUK;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('Autofocus', () => {
|
describe('Autofocus', () => {
|
||||||
|
|||||||
@@ -1,13 +1,6 @@
|
|||||||
const helpers = require('./support/helpers');
|
const helpers = require('./support/helpers');
|
||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
// set up jQuery
|
|
||||||
window.jQuery = require('jquery');
|
|
||||||
$ = window.jQuery;
|
|
||||||
|
|
||||||
// load module code
|
|
||||||
require('govuk_frontend_toolkit/javascripts/govuk/modules.js');
|
|
||||||
|
|
||||||
// TODO: remove this when tests for sticky JS are written
|
// TODO: remove this when tests for sticky JS are written
|
||||||
require('../../app/assets/javascripts/stick-to-window-when-scrolling.js');
|
require('../../app/assets/javascripts/stick-to-window-when-scrolling.js');
|
||||||
|
|
||||||
@@ -15,10 +8,7 @@ beforeAll(() => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
afterAll(() => {
|
afterAll(() => {
|
||||||
window.jQuery = null;
|
require('./support/teardown.js');
|
||||||
$ = null;
|
|
||||||
|
|
||||||
delete window.GOVUK;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,11 @@
|
|||||||
const helpers = require('./support/helpers');
|
const helpers = require('./support/helpers');
|
||||||
|
|
||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
// set up jQuery
|
|
||||||
window.jQuery = require('jquery');
|
|
||||||
$ = window.jQuery;
|
|
||||||
|
|
||||||
// load module code
|
|
||||||
require('govuk_frontend_toolkit/javascripts/govuk/modules.js');
|
|
||||||
require('../../app/assets/javascripts/fullscreenTable.js');
|
require('../../app/assets/javascripts/fullscreenTable.js');
|
||||||
});
|
});
|
||||||
|
|
||||||
afterAll(() => {
|
afterAll(() => {
|
||||||
window.jQuery = null;
|
require('./support/teardown.js');
|
||||||
$ = null;
|
|
||||||
|
|
||||||
delete window.GOVUK;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('FullscreenTable', () => {
|
describe('FullscreenTable', () => {
|
||||||
|
|||||||
3
tests/javascripts/jest.config.js
Normal file
3
tests/javascripts/jest.config.js
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
module.exports = {
|
||||||
|
setupFiles: ['./support/setup.js']
|
||||||
|
}
|
||||||
@@ -1,19 +1,11 @@
|
|||||||
beforeAll(() => {
|
beforeAll(() => {
|
||||||
// set up jQuery & HoganJS
|
|
||||||
window.jQuery = require('jquery');
|
|
||||||
$ = window.jQuery;
|
|
||||||
Hogan = require('hogan.js');
|
Hogan = require('hogan.js');
|
||||||
|
|
||||||
// load module code
|
|
||||||
require('govuk_frontend_toolkit/javascripts/govuk/modules.js');
|
|
||||||
require('../../app/assets/javascripts/listEntry.js');
|
require('../../app/assets/javascripts/listEntry.js');
|
||||||
});
|
});
|
||||||
|
|
||||||
afterAll(() => {
|
afterAll(() => {
|
||||||
window.jQuery = null;
|
require('./support/teardown.js');
|
||||||
$ = null;
|
|
||||||
|
|
||||||
delete window.GOVUK;
|
|
||||||
});
|
});
|
||||||
|
|
||||||
describe("List entry", () => {
|
describe("List entry", () => {
|
||||||
|
|||||||
6
tests/javascripts/support/setup.js
Normal file
6
tests/javascripts/support/setup.js
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
// set up jQuery
|
||||||
|
window.jQuery = require('jquery');
|
||||||
|
$ = window.jQuery;
|
||||||
|
|
||||||
|
// load module code
|
||||||
|
require('govuk_frontend_toolkit/javascripts/govuk/modules.js');
|
||||||
4
tests/javascripts/support/teardown.js
Normal file
4
tests/javascripts/support/teardown.js
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
window.jQuery = null;
|
||||||
|
$ = null;
|
||||||
|
|
||||||
|
delete window.GOVUK;
|
||||||
Reference in New Issue
Block a user