diff --git a/.travis.yml b/.travis.yml index aa13bfbdc4..b87efdfd53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,12 @@ before_install: - gem update --system - gem install sass --version "=3.3.7" - npm i nsp -g + - 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 start 2>&1 &' + - sleep 3 after_script: - nsp audit-package - grunt coverage diff --git a/protractor.conf.js b/protractor.conf.js index cf92640b55..b850439efb 100644 --- a/protractor.conf.js +++ b/protractor.conf.js @@ -1,6 +1,14 @@ 'use strict'; // Protractor configuration -exports.config = { +var config = { specs: ['modules/*/tests/e2e/*.js'] }; + +if (process.env.TRAVIS) { + config.capabilities = { + browserName: 'firefox' + }; +} + +exports.config = config;