diff --git a/gulp/config.js b/gulp/config.js index 6e97eab7..ef481480 100644 --- a/gulp/config.js +++ b/gulp/config.js @@ -4,6 +4,7 @@ export default { browserPort: 3000, UIPort: 3001, + testPort: 3002, sourceDir: './app/', buildDir: './build/', diff --git a/gulp/tasks/protractor.js b/gulp/tasks/protractor.js index 7a992427..3113c88f 100644 --- a/gulp/tasks/protractor.js +++ b/gulp/tasks/protractor.js @@ -15,7 +15,7 @@ gulp.task('protractor', ['prod', 'webdriver'], function(cb) { const testFiles = gulp.src('test/e2e/**/*.js'); testServer({ - port: config.browserPort, + port: config.testPort, dir: config.buildDir }).then((server) => { testFiles.pipe(protractor({ diff --git a/package.json b/package.json index c2c19d8f..32fdbc55 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "angularjs-gulp-browserify-boilerplate", - "version": "1.5.3", + "version": "1.5.4", "author": "Jake Marsh ", "description": "Boilerplate using AngularJS, SASS, Gulp, and Browserify while also utilizing best practices.", "repository": { @@ -79,7 +79,7 @@ }, "scripts": { "test": "./node_modules/.bin/gulp test", - "webdriver-update": "./node_modules/.bin/webdriver-manager update", + "webdriver-update": "./node_modules/gulp-protractor/node_modules/protractor/bin/webdriver-manager update", "postinstall": "npm run webdriver-update" }, "license": "MIT" diff --git a/test/protractor.conf.js b/test/protractor.conf.js index 3d7f2b43..b3dc18bc 100644 --- a/test/protractor.conf.js +++ b/test/protractor.conf.js @@ -6,7 +6,7 @@ exports.config = { allScriptsTimeout: 11000, - baseUrl: `http://localhost:${gulpConfig.browserPort}/`, + baseUrl: `http://localhost:${gulpConfig.testPort}/`, capabilities: { browserName: 'chrome',