Skip to content

Commit f88e6c4

Browse files
committed
Merge pull request #170 from jakemmarsh/protractor-server-port
run protractor tests on separate port
2 parents a27a499 + c01a581 commit f88e6c4

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

gulp/config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export default {
44

55
browserPort: 3000,
66
UIPort: 3001,
7+
testPort: 3002,
78

89
sourceDir: './app/',
910
buildDir: './build/',

gulp/tasks/protractor.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ gulp.task('protractor', ['prod', 'webdriver'], function(cb) {
1515
const testFiles = gulp.src('test/e2e/**/*.js');
1616

1717
testServer({
18-
port: config.browserPort,
18+
port: config.testPort,
1919
dir: config.buildDir
2020
}).then((server) => {
2121
testFiles.pipe(protractor({

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-gulp-browserify-boilerplate",
3-
"version": "1.5.3",
3+
"version": "1.5.4",
44
"author": "Jake Marsh <[email protected]>",
55
"description": "Boilerplate using AngularJS, SASS, Gulp, and Browserify while also utilizing best practices.",
66
"repository": {
@@ -79,7 +79,7 @@
7979
},
8080
"scripts": {
8181
"test": "./node_modules/.bin/gulp test",
82-
"webdriver-update": "./node_modules/.bin/webdriver-manager update",
82+
"webdriver-update": "./node_modules/gulp-protractor/node_modules/protractor/bin/webdriver-manager update",
8383
"postinstall": "npm run webdriver-update"
8484
},
8585
"license": "MIT"

test/protractor.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports.config = {
66

77
allScriptsTimeout: 11000,
88

9-
baseUrl: `http://localhost:${gulpConfig.browserPort}/`,
9+
baseUrl: `http://localhost:${gulpConfig.testPort}/`,
1010

1111
capabilities: {
1212
browserName: 'chrome',

0 commit comments

Comments
 (0)