diff --git a/.travis.yml b/.travis.yml index 31d50074..c24b0be5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ before_install: - npm install protractor - 'export DISPLAY=:99.0' - 'sh -e /etc/init.d/xvfb start' - - 'node_modules/protractor/bin/webdriver-manager update --standalone --firefox' + - 'node_modules/protractor/bin/webdriver-manager update --standalone' - 'node_modules/protractor/bin/webdriver-manager start 2>&1 &' - sleep 3 #before_script: diff --git a/package.json b/package.json index c6394e54..70953a40 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "gulp-mocha": "~3.0.1", "gulp-ng-annotate": "~2.0.0", "gulp-nodemon": "~2.2.1", - "gulp-protractor": "^3.0.0", + "gulp-protractor": "^4.0.0", "gulp-refresh": "~1.1.0", "gulp-rename": "~1.2.2", "gulp-rev": "^7.1.2", diff --git a/protractor.conf.js b/protractor.conf.js index b850439e..b9af1828 100644 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -7,7 +7,12 @@ var config = { if (process.env.TRAVIS) { config.capabilities = { - browserName: 'firefox' + // Without this setting, Travis CI would default + // to using Chrome anyway. + // NOTE: Firefox is currently not working with + // the Travis CI builds. For more info see: + // https://github.com/meanjs/mean/pull/1805 + browserName: 'chrome' }; }