From 055d419e708ba1268e4e60034f4309c7ccea871c Mon Sep 17 00:00:00 2001
From: Arjan Singh <arjan.singh@dollarshaveclub.com>
Date: Mon, 15 Aug 2016 15:33:51 -0700
Subject: [PATCH] [testing] Use Chrome, not PhantomJS

---
 .travis.yml | 16 ++++++++++++++--
 testem.js   | 29 ++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 00c58228..6e25962a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,24 @@ language: node_js
 node_js:
   - "4"
 
-sudo: false
+before_install:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - phantomjs --version
+
+sudo: required
+
+dist: trusty
 
 cache:
   directories:
     - node_modules
+    - bower_components
 
 env:
   - EMBER_TRY_SCENARIO=default
@@ -24,7 +37,6 @@ matrix:
 before_install:
   - npm config set spin false
   - npm install -g bower
-  - npm install phantomjs-prebuilt
 
 install:
   - npm install
diff --git a/testem.js b/testem.js
index 8c56a4a5..4495d946 100644
--- a/testem.js
+++ b/testem.js
@@ -9,5 +9,32 @@ module.exports = {
   "launch_in_dev": [
     "PhantomJS",
     "Chrome"
-  ]
+  ],
+  launch_in_ci: [
+    'Chrome Custom',
+  ],
+  launch_in_dev: [
+    'Chrome Custom',
+  ],
+  launchers: {
+    'Chrome Custom': {
+      exe: [
+        'chromiunm-browser',
+        '~/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+        '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
+      ],
+      args: [
+        '--user-data-dir=/tmp/testem.chrome.custom',
+        '--no-default-browser-check',
+        '--no-first-run',
+        '--ignore-certificate-errors',
+        '--test-type',
+        '--disable-extensions',
+        '--disable-web-security',
+        '--disable-renderer-backgrounding',
+        '--disable-background-timer-throttling',
+      ],
+      protocol: 'browser',
+    },
+  },
 };