diff --git a/.travis.yml b/.travis.yml index 6b1ade102..11fc44723 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,10 @@ install: - (cd web && npm install --no-progress && npm run build:prod) && mvn clean install -q -f lib/ -DskipTests=true -Dmaven.javadoc.skip=true -B && mvn clean install -q -f rest/ -DskipTests=true -Dmaven.javadoc.skip=true -B +before_script: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" + - sleep 3 # give xvfb some time to start script: - (cd web && npm run test) && mvn verify -f lib/ diff --git a/web/karma.conf.js b/web/karma.conf.js index 3190aba48..77b1c964e 100644 --- a/web/karma.conf.js +++ b/web/karma.conf.js @@ -42,6 +42,7 @@ module.exports = function (config) { logLevel: config.LOG_INFO, autoWatch: true, browsers: ['Firefox', 'PhantomJS'], - singleRun: false + singleRun: false, + browserNoActivityTimeout: 30000 }); };