From 82ffbf9d83ea286d24265e0c505c2cd8ed5aacac Mon Sep 17 00:00:00 2001 From: Fred Chasen Date: Tue, 8 May 2018 16:58:55 -0700 Subject: [PATCH] Add Specs --- jest.config.js | 6 ------ package.json | 3 ++- ...ult-test-js-break-should-create-a-pdf-1-snap.png | Bin {tests/specs => specs}/default/default.html | 0 {tests/specs => specs}/default/default.test.js | 0 specs/jest.config.js | 7 +++++++ {jest => specs/jest_helpers}/constants.js | 0 {jest => specs/jest_helpers}/pdf_snapshot.js | 0 .../jest_helpers}/puppeteer_environment.js | 2 +- {jest => specs/jest_helpers}/setup.js | 2 +- {jest => specs/jest_helpers}/setup_tests.js | 0 {jest => specs/jest_helpers}/teardown.js | 0 tests/jest.config.js | 3 +++ 13 files changed, 14 insertions(+), 9 deletions(-) delete mode 100755 jest.config.js rename {tests/specs => specs}/default/__image_snapshots__/default-test-js-break-should-create-a-pdf-1-snap.png (100%) rename {tests/specs => specs}/default/default.html (100%) rename {tests/specs => specs}/default/default.test.js (100%) create mode 100755 specs/jest.config.js rename {jest => specs/jest_helpers}/constants.js (100%) rename {jest => specs/jest_helpers}/pdf_snapshot.js (100%) rename {jest => specs/jest_helpers}/puppeteer_environment.js (95%) rename {jest => specs/jest_helpers}/setup.js (93%) rename {jest => specs/jest_helpers}/setup_tests.js (100%) rename {jest => specs/jest_helpers}/teardown.js (100%) create mode 100644 tests/jest.config.js diff --git a/jest.config.js b/jest.config.js deleted file mode 100755 index d781137..0000000 --- a/jest.config.js +++ /dev/null @@ -1,6 +0,0 @@ -module.exports = { - globalSetup: './jest/setup.js', - globalTeardown: './jest/teardown.js', - testEnvironment: './jest/puppeteer_environment.js', - setupTestFrameworkScriptFile: './jest/setup_tests.js' -} diff --git a/package.json b/package.json index b9834b6..2819e1b 100755 --- a/package.json +++ b/package.json @@ -35,7 +35,8 @@ "scripts": { "build": "./node_modules/.bin/rollup -c", "start": "./node_modules/.bin/rollup -w -c rollup.server.config.js", - "test": "jest", + "test": "jest --config=test/jest.config.js", + "specs": "jest --config=specs/jest.config.js", "compile": "./node_modules/.bin/babel src/ -d lib/", "pretest": "npm run build", "prepare": "npm run build && npm run compile", diff --git a/tests/specs/default/__image_snapshots__/default-test-js-break-should-create-a-pdf-1-snap.png b/specs/default/__image_snapshots__/default-test-js-break-should-create-a-pdf-1-snap.png similarity index 100% rename from tests/specs/default/__image_snapshots__/default-test-js-break-should-create-a-pdf-1-snap.png rename to specs/default/__image_snapshots__/default-test-js-break-should-create-a-pdf-1-snap.png diff --git a/tests/specs/default/default.html b/specs/default/default.html similarity index 100% rename from tests/specs/default/default.html rename to specs/default/default.html diff --git a/tests/specs/default/default.test.js b/specs/default/default.test.js similarity index 100% rename from tests/specs/default/default.test.js rename to specs/default/default.test.js diff --git a/specs/jest.config.js b/specs/jest.config.js new file mode 100755 index 0000000..755da4c --- /dev/null +++ b/specs/jest.config.js @@ -0,0 +1,7 @@ +module.exports = { + testMatch: ['**/?(*.)(spec|test).js?(x)'], + globalSetup: './jest_helpers/setup.js', + globalTeardown: './jest_helpers/teardown.js', + testEnvironment: './jest_helpers/puppeteer_environment.js', + setupTestFrameworkScriptFile: './jest_helpers/setup_tests.js' +} diff --git a/jest/constants.js b/specs/jest_helpers/constants.js similarity index 100% rename from jest/constants.js rename to specs/jest_helpers/constants.js diff --git a/jest/pdf_snapshot.js b/specs/jest_helpers/pdf_snapshot.js similarity index 100% rename from jest/pdf_snapshot.js rename to specs/jest_helpers/pdf_snapshot.js diff --git a/jest/puppeteer_environment.js b/specs/jest_helpers/puppeteer_environment.js similarity index 95% rename from jest/puppeteer_environment.js rename to specs/jest_helpers/puppeteer_environment.js index b12b8d9..f93d9c1 100755 --- a/jest/puppeteer_environment.js +++ b/specs/jest_helpers/puppeteer_environment.js @@ -58,7 +58,7 @@ class PuppeteerEnvironment extends NodeEnvironment { renderedResolve(msg, width, height, orientation); }); - await page.goto(ORIGIN + '/tests/specs/' + path, { waitUntil: 'networkidle2' }); + await page.goto(ORIGIN + '/specs/' + path, { waitUntil: 'networkidle2' }); return page; } diff --git a/jest/setup.js b/specs/jest_helpers/setup.js similarity index 93% rename from jest/setup.js rename to specs/jest_helpers/setup.js index ede38bc..6384c8d 100755 --- a/jest/setup.js +++ b/specs/jest_helpers/setup.js @@ -13,7 +13,7 @@ const { WS_ENDPOINT_PATH, DIR, DEBUG, CI, PORT } = require('./constants'); module.exports = async function() { DEBUG && console.log(chalk.green('Starting Static Server\n')); - app.use(express.static(path.join(__dirname, '../'))); + app.use(express.static(path.join(__dirname, '../../'))); const server = app.listen(PORT); global.server = server; global.origin = `http://localhost:${PORT}`; diff --git a/jest/setup_tests.js b/specs/jest_helpers/setup_tests.js similarity index 100% rename from jest/setup_tests.js rename to specs/jest_helpers/setup_tests.js diff --git a/jest/teardown.js b/specs/jest_helpers/teardown.js similarity index 100% rename from jest/teardown.js rename to specs/jest_helpers/teardown.js diff --git a/tests/jest.config.js b/tests/jest.config.js new file mode 100644 index 0000000..8933778 --- /dev/null +++ b/tests/jest.config.js @@ -0,0 +1,3 @@ +module.exports = { + testMatch: ['tests/**/?(*.)(spec|test).js?(x)'], +} -- 2.22.0