Skip to content

Commit b2af4fd

Browse files
committed
Fix prepree2e script
1 parent 6a9836a commit b2af4fd

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

package.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@
1919
"ng": "ng",
2020
"lint": "ng lint",
2121
"start": "webpack --watch",
22-
"test": "karma start ./karma.conf.js",
23-
"e2e": "protractor ./protractor.conf.js",
24-
"prepree2e": "npm start",
25-
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet",
2622
"build": "webpack --display-error-details && copyfiles main.js dist",
2723
"build:prod": "cross-env NODE_ENV='production' npm run build",
2824
"electron:serve": "electron . --serve",
2925
"electron:dev": "npm run build && electron dist/main.js",
3026
"electron:prod": "npm run build:prod && electron dist/main.js",
3127
"electron:linux": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=linux --arch=x64 --asar=true --out=app-builds",
3228
"electron:windows": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=win32 --arch=ia32 --asar=true --out=app-builds",
33-
"electron:mac": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=darwin --arch=x64 --asar=true --out=app-builds"
29+
"electron:mac": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=darwin --arch=x64 --asar=true --out=app-builds",
30+
"test": "karma start ./karma.conf.js",
31+
"e2e": "protractor ./protractor.conf.js",
32+
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet",
33+
"prepree2e": "webpack-dev-server . --port 4200"
3434
},
3535
"dependencies": {
3636
"@angular/common": "~4.0.2",
@@ -49,7 +49,7 @@
4949
"@angular/cli": "1.0.0",
5050
"@angular/compiler-cli": "~4.0.2",
5151
"@types/electron": "~1.4.37",
52-
"@types/jasmine": "~2.5.38",
52+
"@types/jasmine": "2.5.41",
5353
"@types/node": "~7.0.13",
5454
"autoprefixer": "~6.7.7",
5555
"codelyzer": "~2.1.1",
@@ -90,7 +90,8 @@
9090
"typescript": "~2.2.2",
9191
"url-loader": "~0.5.8",
9292
"webdriver-manager": "~12.0.4",
93-
"webpack": "~2.4.1"
93+
"webpack": "~2.4.1",
94+
"webpack-dev-server": "^2.4.5"
9495
},
9596
"license": "SEE LICENSE IN LICENSE.md"
9697
}

protractor.conf.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ exports.config = {
99
'./e2e/**/*.e2e-spec.ts'
1010
],
1111
capabilities: {
12-
'browserName': 'chrome'
12+
'browserName': 'chrome',
13+
chromeOptions: {
14+
binary: './node_modules/electron/dist/electron.exe',
15+
args: ['--test-type=webdriver', 'app=main.js']
16+
}
1317
},
1418
directConnect: true,
1519
baseUrl: 'http://localhost:4200/',

0 commit comments

Comments
 (0)