From 6bb6a17046906af63cabed9ff511432c2c6a741d Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@twitter.com>
Date: Fri, 4 Sep 2015 00:10:29 -0700
Subject: [PATCH] Fix travis build

---
 .travis.yml            | 3 +++
 config/karma.config.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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: {