From 72017d85eeed2b4dc2764b1bb29eafaf6ed5cb7a Mon Sep 17 00:00:00 2001
From: Marten Schilstra <mail@martenschilstra.nl>
Date: Fri, 5 Feb 2016 16:33:52 +0100
Subject: [PATCH] Use Google Chrome to run tests

---
 .travis.yml | 10 +++++++++-
 testem.json |  3 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8197d31..d4a31ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,13 @@ node_js:
 
 sudo: false
 
+addons:
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
+
 cache:
   directories:
     - node_modules
@@ -21,7 +28,8 @@ matrix:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
   - "npm config set spin false"
   - "npm install -g npm@^2"
 
diff --git a/testem.json b/testem.json
index 0f35392..b697025 100644
--- a/testem.json
+++ b/testem.json
@@ -3,10 +3,9 @@
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
-    "PhantomJS"
+    "Chrome"
   ],
   "launch_in_dev": [
-    "PhantomJS",
     "Chrome"
   ]
 }