diff --git a/.travis.yml b/.travis.yml index d35c6562..201ca059 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ language: node_js node_js: - "0.12" +before_script: + - export DISPLAY=:99.0 + - sh -e /etc/init.d/xvfb start diff --git a/config/karma.config.js b/config/karma.config.js index a2f50320..35cb87f9 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -5,7 +5,7 @@ var webpackConfig = require('./webpack-base.config.js') module.exports = function (config) { config.set({ basePath: path.resolve(__dirname, '..'), - browsers: [ 'Chrome' ], + browsers: [ process.env.TRAVIS ? 'Firefox' : 'Chrome' ], browserNoActivityTimeout: 60000, client: { captureConsole: true, @@ -29,7 +29,7 @@ module.exports = function (config) { preprocessors: { 'src/specs.bundle.js': [ 'webpack', 'sourcemap' ] }, - reporters: [ 'dots' ], + reporters: [ process.env.TRAVIS ? 'dots' : 'progress' ], singleRun: true, webpack: assign({}, webpackConfig, { devtool: 'inline' }), webpackMiddleware: {