From 4e5deb4461bc276685480b5ddb904e54a93935a0 Mon Sep 17 00:00:00 2001 From: "Juan Picado @jotadeveloper" Date: Sun, 17 Jun 2018 11:44:47 +0200 Subject: [PATCH] refactor: relocate jest conf file e2e --- .npmignore | 2 +- jest.e2e.config.js | 11 ----------- package.json | 2 +- test/e2e/jest.e2e.config.js | 11 +++++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 jest.e2e.config.js create mode 100644 test/e2e/jest.e2e.config.js diff --git a/.npmignore b/.npmignore index 57006392b..c3b06b3a4 100644 --- a/.npmignore +++ b/.npmignore @@ -24,7 +24,7 @@ test/ types/ wiki/ jestEnvironment.js -jest.e2e.config.js +test/e2e/jest.e2e.config.js jest.config.js debug/ diff --git a/jest.e2e.config.js b/jest.e2e.config.js deleted file mode 100644 index 4a8d79f2b..000000000 --- a/jest.e2e.config.js +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint comma-dangle: 0 */ - -module.exports = { - name: 'verdaccio-e2e-jest', - verbose: true, - collectCoverage: false, - globalSetup: './test/e2e/pre-setup.js', - globalTeardown: './test/e2e/teardown.js', - testEnvironment: './test/e2e/puppeteer_environment.js', - testRegex: '(/test/e2e/e2e.*\\.spec)\\.js' -}; diff --git a/package.json b/package.json index 2e14d0575..525e59eab 100644 --- a/package.json +++ b/package.json @@ -157,7 +157,7 @@ "test": "cross-env NODE_ENV=test BABEL_ENV=test TZ=UTC jest --maxWorkers 2", "test:unit": "cross-env NODE_ENV=test BABEL_ENV=test TZ=UTC jest '(/test/unit.*\\.spec|/test/webui/.*\\.spec)\\.js' --maxWorkers 2", "test:func": "cross-env NODE_ENV=test BABEL_ENV=test jest '(/test/functional.*\\.func)\\.js' --maxWorkers 2", - "test:e2e": "cross-env BABEL_ENV=testE2E jest --config ./jest.e2e.config.js --maxWorkers 2", + "test:e2e": "cross-env BABEL_ENV=testE2E jest --config ./test/e2e/jest.e2e.config.js --maxWorkers 2", "test:all": "npm run test && npm run test:e2e", "pre:ci": "npm run lint && npm run build:webui", "commitmsg": "commitlint -e $GIT_PARAMS", diff --git a/test/e2e/jest.e2e.config.js b/test/e2e/jest.e2e.config.js new file mode 100644 index 000000000..16520dcf0 --- /dev/null +++ b/test/e2e/jest.e2e.config.js @@ -0,0 +1,11 @@ +/* eslint comma-dangle: 0 */ + +module.exports = { + name: 'verdaccio-e2e-jest', + verbose: true, + collectCoverage: false, + globalSetup: './pre-setup.js', + globalTeardown: './teardown.js', + testEnvironment: './puppeteer_environment.js', + testRegex: '(/e2e.*\\.spec)\\.js' +};