Move setup/teardown out of tests

This commit is contained in:
Tom Byers
2019-05-21 10:56:38 +01:00
committed by Chris Hill-Scott
parent 435334ba9c
commit 0131f0c1b1
8 changed files with 18 additions and 41 deletions

View File

@@ -6,7 +6,7 @@
"node": "10.15.3"
},
"scripts": {
"test": "gulp lint && jest tests/javascripts",
"test": "gulp lint && jest --config tests/javascripts/jest.config.js tests/javascripts",
"build": "gulp",
"watch": "gulp watch"
},

View File

@@ -1,18 +1,9 @@
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');
});
afterAll(() => {
window.jQuery = null;
$ = null;
delete window.GOVUK;
require('./support/teardown.js');
});
describe('Autofocus', () => {

View File

@@ -1,13 +1,6 @@
const helpers = require('./support/helpers');
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
require('../../app/assets/javascripts/stick-to-window-when-scrolling.js');
@@ -15,10 +8,7 @@ beforeAll(() => {
});
afterAll(() => {
window.jQuery = null;
$ = null;
delete window.GOVUK;
require('./support/teardown.js');
});

View File

@@ -1,20 +1,11 @@
const helpers = require('./support/helpers');
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');
});
afterAll(() => {
window.jQuery = null;
$ = null;
delete window.GOVUK;
require('./support/teardown.js');
});
describe('FullscreenTable', () => {

View File

@@ -0,0 +1,3 @@
module.exports = {
setupFiles: ['./support/setup.js']
}

View File

@@ -1,19 +1,11 @@
beforeAll(() => {
// set up jQuery & HoganJS
window.jQuery = require('jquery');
$ = window.jQuery;
Hogan = require('hogan.js');
// load module code
require('govuk_frontend_toolkit/javascripts/govuk/modules.js');
require('../../app/assets/javascripts/listEntry.js');
});
afterAll(() => {
window.jQuery = null;
$ = null;
delete window.GOVUK;
require('./support/teardown.js');
});
describe("List entry", () => {

View 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');

View File

@@ -0,0 +1,4 @@
window.jQuery = null;
$ = null;
delete window.GOVUK;