From 4e283993c668c9bbc19eabaa5d7f3272b4719ef0 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 24 Dec 2015 11:01:03 +0100
Subject: [PATCH] Try testing with Chrome

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

diff --git a/.travis.yml b/.travis.yml
index b6f36c35..24923590 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,11 @@ matrix:
 
 addons:
   sauce_connect: true
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
 
 sudo: false
 
@@ -29,10 +34,8 @@ cache:
 before_install:
   - "npm config set spin false"
   - "npm install -g npm@^2"
-  - mkdir travis-phantomjs
-  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
-  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
-  - export PATH=$PWD/travis-phantomjs:$PATH
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
 
 install:
   - npm install -g bower
diff --git a/testem.json b/testem.json
index e5e2046a..b697025a 100644
--- a/testem.json
+++ b/testem.json
@@ -1,51 +1,11 @@
 {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
   "launch_in_ci": [
-    "PhantomJS"
+    "Chrome"
   ],
   "launch_in_dev": [
-    "PhantomJS"
-  ],
-  "launchers": {
-    "SL_chrome": {
-      "exe": "./node_modules/.bin/ember-cli-sauce",
-      "args": [
-        "-b",
-        "chrome",
-        "-p",
-        "Windows 8",
-        "--at",
-        "--no-ct",
-        "--u"
-      ],
-      "protocol": "browser"
-    },
-    "SL_firefox": {
-      "exe": "./node_modules/.bin/ember-cli-sauce",
-      "args": [
-        "-b",
-        "firefox",
-        "-p",
-        "Windows 8",
-        "--at",
-        "--no-ct",
-        "--u"
-      ],
-      "protocol": "browser"
-    },
-    "SL_safari": {
-      "exe": "./node_modules/.bin/ember-cli-sauce",
-      "args": [
-        "-b",
-        "safari",
-        "-p",
-        "Mac 10.10",
-        "--at",
-        "--no-ct",
-        "--u"
-      ],
-      "protocol": "browser"
-    }
-  }
+    "Chrome"
+  ]
 }