Fix travis build

This commit is contained in:
Nicolas Gallagher
2015-09-04 00:10:29 -07:00
parent b5c8af2694
commit 6bb6a17046
2 changed files with 5 additions and 2 deletions

View File

@@ -1,3 +1,6 @@
language: node_js language: node_js
node_js: node_js:
- "0.12" - "0.12"
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start

View File

@@ -5,7 +5,7 @@ var webpackConfig = require('./webpack-base.config.js')
module.exports = function (config) { module.exports = function (config) {
config.set({ config.set({
basePath: path.resolve(__dirname, '..'), basePath: path.resolve(__dirname, '..'),
browsers: [ 'Chrome' ], browsers: [ process.env.TRAVIS ? 'Firefox' : 'Chrome' ],
browserNoActivityTimeout: 60000, browserNoActivityTimeout: 60000,
client: { client: {
captureConsole: true, captureConsole: true,
@@ -29,7 +29,7 @@ module.exports = function (config) {
preprocessors: { preprocessors: {
'src/specs.bundle.js': [ 'webpack', 'sourcemap' ] 'src/specs.bundle.js': [ 'webpack', 'sourcemap' ]
}, },
reporters: [ 'dots' ], reporters: [ process.env.TRAVIS ? 'dots' : 'progress' ],
singleRun: true, singleRun: true,
webpack: assign({}, webpackConfig, { devtool: 'inline' }), webpack: assign({}, webpackConfig, { devtool: 'inline' }),
webpackMiddleware: { webpackMiddleware: {