refactor: move n2e to e2e

This commit is contained in:
Johannes Millan 2021-02-20 12:56:08 +01:00
parent 04daa1e41b
commit 6869cdc80f
20 changed files with 9 additions and 9 deletions

View file

@ -5,7 +5,7 @@
{
"files": ["*.ts"],
"parserOptions": {
"project": ["tsconfig.json", "n2e/tsconfig.n2e.json"],
"project": ["tsconfig.json", "e2e/tsconfig.e2e.json"],
"createDefaultProgram": true
},
"extends": [

2
.gitignore vendored
View file

@ -41,7 +41,7 @@ testem.log
/typings
chromedriver.log
e2e-test-results
n2e/screenshots
e2e/screenshots
package-lock.json
# System Files

View file

@ -2,10 +2,10 @@ module.exports = {
// An array of folders (excluding subfolders) where your tests are located;
// if this is not specified, the test source must be passed as the second argument to the test runner.
src_folders: [
'../out-tsc/n2e/src'
'../out-tsc/e2e/src'
],
output_folder: "./e2e-test-results",
custom_commands_path: "out-tsc/n2e/commands",
custom_commands_path: "out-tsc/e2e/commands",
test_workers: {
enabled: true,
workers: "auto"
@ -43,7 +43,7 @@ module.exports = {
enabled: true, // if you want to keep screenshots
on_failure: true,
on_error: true,
path: './n2e/screenshots' // save screenshots here
path: './e2e/screenshots' // save screenshots here
},
globals: {
waitForConditionPollInterval: 500,

View file

@ -1,7 +1,7 @@
{
"extends": "../tsconfig.base.json",
"compilerOptions": {
"outDir": "../out-tsc/n2e",
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"moduleResolution": "node",
"target": "es5",

View file

@ -35,8 +35,8 @@
"test:watch": "ng test --browsers ChromeHeadless",
"lint": "ng lint",
"preCheck": "yarn lint && yarn test && yarn e2e",
"e2e": "cross-env DETECT_CHROMEDRIVER_VERSION=true SKIP_POST_INSTALL=true yarn add -D chromedriver && tsc --project n2e/tsconfig.n2e.json && start-server-and-test 'ng serve' 4200 'nightwatch -c ./n2e/nightwatch.conf.js --suiteRetries 1 --retries 0'",
"e2e:tag": "rm -R ./out-tsc; tsc --project n2e/tsconfig.n2e.json && nightwatch -c ./n2e/nightwatch.conf.js --suiteRetries 0 --retries 0 --tag ",
"e2e": "cross-env DETECT_CHROMEDRIVER_VERSION=true SKIP_POST_INSTALL=true yarn add -D chromedriver && tsc --project e2e/tsconfig.e2e.json && start-server-and-test 'ng serve' 4200 'nightwatch -c ./e2e/nightwatch.conf.js --suiteRetries 1 --retries 0'",
"e2e:tag": "rm -R ./out-tsc; tsc --project e2e/tsconfig.e2e.json && nightwatch -c ./e2e/nightwatch.conf.js --suiteRetries 0 --retries 0 --tag ",
"electron": "NODE_ENV=PROD electron .",
"electron:build": "tsc -p electron/tsconfig.electron.json",
"electron:watch": "tsc -p electron/tsconfig.electron.json --watch",
@ -194,4 +194,4 @@
"resolutions": {
"webpack": "4.44.2"
}
}
}