Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-21 22:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular/cli): fix e2e after eject

Browse Source 
Start webpack-dev-server with e2e & sync its port with protractor default config port.

Close #4957
This commit is contained in:
Meligy 2017-02-24 01:20:59 +11:00 committed by Filipe Silva
parent 48324d11cb
commit 3b39843513
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/@angular/cli/tasks/eject.ts
View File

@ -439,6 +439,12 @@ export default Task.extend({
Your package.json scripts needs to not contain a start script as it will be overwritten.
`);
}
if (scripts['pree2e'] && scripts['prepree2e'] !== 'npm start' && !force) {
throw new SilentError(oneLine`
Your package.json scripts needs to not contain a prepree2e script as it will be
overwritten.
`);
}
if (scripts['pree2e'] && scripts['pree2e'] !== pree2eNpmScript && !force) {
throw new SilentError(oneLine`
Your package.json scripts needs to not contain a pree2e script as it will be
@ -457,8 +463,9 @@ export default Task.extend({
}
packageJson['scripts']['build'] = 'webpack';
packageJson['scripts']['start'] = 'webpack-dev-server';
packageJson['scripts']['start'] = 'webpack-dev-server --port=4200';
packageJson['scripts']['test'] = 'karma start ./karma.conf.js';
packageJson['scripts']['prepree2e'] = 'npm start';
packageJson['scripts']['pree2e'] = pree2eNpmScript;
packageJson['scripts']['e2e'] = 'protractor ./protractor.conf.js';