From ff4401aeac921bfa42f33dee551260b337fc1081 Mon Sep 17 00:00:00 2001
From: Dan Seripap <daniel@seripap.com>
Date: Mon, 4 Jul 2016 23:12:20 -0400
Subject: [PATCH] Fix travis tests

---
 .travis.yml   | 13 ++++++++++---
 karma.conf.js |  7 ++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0c9dcff..f9be0c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,18 @@
+sudo: required
+dist: trusty
 language: node_js
 node_js:
   - 5.2.0
-sudo: required
 cache:
   directories:
     - node_modules
+addons:
+apt:
+  sources:
+    - google-chrome
+  packages:
+    - google-chrome-stable
+    - google-chrome-beta
 before_install:
   - sudo apt-get update
   - sudo apt-get install -y libappindicator1 fonts-liberation
@@ -12,12 +20,11 @@ before_install:
   - sudo dpkg -i google-chrome*.deb
   - wget http://chromedriver.storage.googleapis.com/2.21/chromedriver_linux64.zip
   - unzip chromedriver_linux64
-  - sudo mv chromedriver /usr/bin
+  - sudo mv chromedriver /usr/bin  
 before_script:
   - export CHROME_BIN=/usr/bin/google-chrome
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
-  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
   - sleep 5 # give xvfb some time to start
   - gulp bundle
   - npm start &
diff --git a/karma.conf.js b/karma.conf.js
index 80b8397..0ebe370 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -49,7 +49,12 @@ module.exports = function(config) {
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: ['Chrome'],
-
+    customLaunchers: {
+      Chrome_without_sandbox: {
+        base: 'Chrome',
+        flags: ['--no-sandbox'] // with sandbox it fails under Docker
+      }
+    },
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: false,