From f345d8335084b663aa61fb2e5da044d56578f842 Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Tue, 9 Feb 2016 18:07:21 +0100
Subject: [PATCH 1/3] 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 72b0747..15f8fba 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
@@ -23,7 +30,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"
   ]
 }

From eec37ff3bdcf0977c1b9aaa006318ec8a89346d1 Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Sat, 16 Apr 2016 19:33:43 +0700
Subject: [PATCH 2/3] Switch to testem.js

---
 testem.js   |  3 ++-
 testem.json | 11 -----------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 testem.json

diff --git a/testem.js b/testem.js
index 26044b2..86e8f8f 100644
--- a/testem.js
+++ b/testem.js
@@ -4,7 +4,8 @@ module.exports = {
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
-    "PhantomJS"
+    "PhantomJS",
+    "Chrome"
   ],
   "launch_in_dev": [
     "PhantomJS",
diff --git a/testem.json b/testem.json
deleted file mode 100644
index b697025..0000000
--- a/testem.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "Chrome"
-  ],
-  "launch_in_dev": [
-    "Chrome"
-  ]
-}

From 38883338ec13d9099f9bc8f7f65cdc561d8d57cc Mon Sep 17 00:00:00 2001
From: Manuel Wiedenmann <manuel@funkensturm.de>
Date: Sat, 16 Apr 2016 19:56:38 +0700
Subject: [PATCH 3/3] Fix travis

---
 .travis.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91e93b4..a70c2e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 ---
 language: node_js
 node_js:
-  - "0.12"
+  - "stable"
 
-sudo: false
+sudo: required
+dist: trusty
 
 addons:
   apt:
@@ -37,11 +38,11 @@ before_install:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
   - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - "npm install -g npm@^3"
 
 install:
   - npm install -g bower
-  - npm install
+  - npm install --no-optional
   - bower install
 
 script: