From 44635df148d2185540dd989757cd6840948ada4a Mon Sep 17 00:00:00 2001
From: Alexander Shemetovsky <alexkval@gmail.com>
Date: Sun, 10 May 2015 12:10:55 +0300
Subject: [PATCH] Revert "Revert "Use Chrome on TravisCI instead of
 PhantomJS.""

---
 .travis.yml   | 4 ++++
 karma.conf.js | 9 ++++++++-
 package.json  | 1 -
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bb8ffc0302..6b69c225d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,3 +11,7 @@ notifications:
     on_success: always
     on_failure: always
     on_start: false
+before_install:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
diff --git a/karma.conf.js b/karma.conf.js
index 5789610e3b..7fe1710b1b 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -43,7 +43,14 @@ module.exports = function (config) {
 
     autoWatch: true,
 
-    browsers: [ isCI ? 'PhantomJS' : 'Chrome' ],
+    browsers: [ isCI ? 'ChromeTravisCI' : 'Chrome' ],
+
+    customLaunchers: {
+      ChromeTravisCI: {
+        base: 'Chrome',
+        flags: ['--no-sandbox']
+      }
+    },
 
     captureTimeout: 60000,
     browserNoActivityTimeout: 45000,
diff --git a/package.json b/package.json
index e0c545a22f..71762e501c 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
     "karma-firefox-launcher": "~0.1.3",
     "karma-mocha": "~0.1.1",
     "karma-mocha-reporter": "^1.0.2",
-    "karma-phantomjs-launcher": "~0.1.1",
     "karma-sinon": "^1.0.3",
     "karma-sourcemap-loader": "^0.3.4",
     "karma-webpack": "^1.5.0",