Skip to content

Commit

Permalink
Update protractor configuration
Browse files Browse the repository at this point in the history
Updates the protractor configuration and associated gulp task.
  • Loading branch information
TheDonDope committed May 26, 2016
1 parent 0129dac commit 4b2ca0b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
"build.test": "gulp build.test --color",
"build.test.watch": "gulp build.test.watch --color",
"generate.manifest": "gulp generate.manifest --color",
"e2e": "protractor",
"e2e.live": "protractor --elementExplorer",
"e2e": "protractor src/browser/protractor.conf.js",
"e2e.live": "protractor src/browser/protractor.conf.js --elementExplorer",
"e2e.singleRun": "gulp build.prod --color && gulp build.js.e2e --color && gulp e2e --color",
"gulp": "gulp",
"karma": "karma",
"karma.start": "karma start",
Expand All @@ -27,8 +28,7 @@
"start": "gulp serve.dev --color",
"tasks.list": "gulp --tasks-simple --color",
"test": "gulp test --color",
"e2e.ci": "gulp build.prod --color && gulp build.js.e2e --color && gulp e2e --color",
"tests.all": "npm test && npm run e2e.ci",
"tests.all": "npm test && npm run e2e.singleRun",
"webdriver-start": "webdriver-manager start",
"webdriver-update": "webdriver-manager update"
},
Expand Down
6 changes: 5 additions & 1 deletion tools/tasks/seed/e2e.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import * as express from 'express';
import * as gulp from 'gulp';
import { protractor } from 'gulp-protractor';
import { join } from 'path';

import { APP_SRC } from '../../config';


class Protractor {
server(port: number, dir: string) {
Expand All @@ -23,7 +27,7 @@ export = (done: any) => {
.then((server: any) => {
gulp
.src('./dist/dev/**/*.e2e-spec.js')
.pipe(protractor({ configFile: 'protractor.conf.js' }))
.pipe(protractor({ configFile: join(process.cwd(), APP_SRC, 'protractor.conf.js') }))
.on('error', (error: string) => { throw error; })
.on('end', () => { server.close(done); });
});
Expand Down

0 comments on commit 4b2ca0b

Please sign in to comment.