david.tahir/AngularTicTacToe
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix prepree2e script

Browse Source
This commit is contained in:
Maxime GRIS
2017-05-05 23:41:23 +02:00
parent 6a9836a1e4
commit b2af4fd24a
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package.json
View File

@@ -19,10 +19,6 @@
"ng": "ng", "ng": "ng",
"lint": "ng lint", "lint": "ng lint",
"start": "webpack --watch", "start": "webpack --watch",
"test": "karma start ./karma.conf.js",
"e2e": "protractor ./protractor.conf.js",
"prepree2e": "npm start",
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet",
"build": "webpack --display-error-details && copyfiles main.js dist", "build": "webpack --display-error-details && copyfiles main.js dist",
"build:prod": "cross-env NODE_ENV='production' npm run build", "build:prod": "cross-env NODE_ENV='production' npm run build",
"electron:serve": "electron . --serve", "electron:serve": "electron . --serve",
@@ -30,7 +26,11 @@
"electron:prod": "npm run build:prod && electron dist/main.js", "electron:prod": "npm run build:prod && electron dist/main.js",
"electron:linux": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=linux --arch=x64 --asar=true --out=app-builds", "electron:linux": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=linux --arch=x64 --asar=true --out=app-builds",
"electron:windows": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=win32 --arch=ia32 --asar=true --out=app-builds", "electron:windows": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=win32 --arch=ia32 --asar=true --out=app-builds",
"electron:mac": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=darwin --arch=x64 --asar=true --out=app-builds" "electron:mac": "npm run build:prod && copyfiles package.json dist && electron-packager dist --overwrite --platform=darwin --arch=x64 --asar=true --out=app-builds",
"test": "karma start ./karma.conf.js",
"e2e": "protractor ./protractor.conf.js",
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet",
"prepree2e": "webpack-dev-server . --port 4200"
}, },
"dependencies": { "dependencies": {
"@angular/common": "~4.0.2", "@angular/common": "~4.0.2",
@@ -49,7 +49,7 @@
"@angular/cli": "1.0.0", "@angular/cli": "1.0.0",
"@angular/compiler-cli": "~4.0.2", "@angular/compiler-cli": "~4.0.2",
"@types/electron": "~1.4.37", "@types/electron": "~1.4.37",
"@types/jasmine": "~2.5.38", "@types/jasmine": "2.5.41",
"@types/node": "~7.0.13", "@types/node": "~7.0.13",
"autoprefixer": "~6.7.7", "autoprefixer": "~6.7.7",
"codelyzer": "~2.1.1", "codelyzer": "~2.1.1",
@@ -90,7 +90,8 @@
"typescript": "~2.2.2", "typescript": "~2.2.2",
"url-loader": "~0.5.8", "url-loader": "~0.5.8",
"webdriver-manager": "~12.0.4", "webdriver-manager": "~12.0.4",
"webpack": "~2.4.1" "webpack": "~2.4.1",
"webpack-dev-server": "^2.4.5"
}, },
"license": "SEE LICENSE IN LICENSE.md" "license": "SEE LICENSE IN LICENSE.md"
} }

6
protractor.conf.js
View File

@@ -9,7 +9,11 @@ exports.config = {
'./e2e/**/*.e2e-spec.ts' './e2e/**/*.e2e-spec.ts'
], ],
capabilities: { capabilities: {
'browserName': 'chrome' 'browserName': 'chrome',
chromeOptions: {
binary: './node_modules/electron/dist/electron.exe',
args: ['--test-type=webdriver', 'app=main.js']
}
}, },
directConnect: true, directConnect: true,
baseUrl: 'http://localhost:4200/', baseUrl: 'http://localhost:4200/',