From 6e5a6038dfb374996c17caccd704f7d185f67f96 Mon Sep 17 00:00:00 2001
From: Steven Glanzer <sglanzer@ciena.com>
Date: Wed, 23 Nov 2016 15:49:05 -0500
Subject: [PATCH 1/4] Changing the coverage config to get coverage working

---
 config/coverage.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/coverage.js b/config/coverage.js
index c18129d6..76b1450b 100644
--- a/config/coverage.js
+++ b/config/coverage.js
@@ -2,12 +2,11 @@ module.exports = {
   coverageEnvVar: 'COVERAGE',
   coverageFolder: 'coverage',
   excludes: [
+    'tests/dummy/**/*',
     '**/mirage/**/*'
   ],
   useBabelInstrumenter: true,
   reporters: [
-    'html',
-    'lcov',
-    'text-summary'
+    'lcov'
   ]
 }

From d11512d2219b1ce30c1d73b29626e305641b0e00 Mon Sep 17 00:00:00 2001
From: Steven Glanzer <sglanzer@ciena.com>
Date: Wed, 23 Nov 2016 15:51:08 -0500
Subject: [PATCH 2/4] Re-enabling coverage in travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 46cd749a..f39fef32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ env:
   - EMBER_TRY_SCENARIO=default
   - EMBER_TRY_SCENARIO=ember-release
   global:
-    - COVERAGE=false # FIXME: When coverage is enabled tests never complete
+    - COVERAGE=true
     - CXX=g++-4.8
     - secure: qvGQ3mqwgWOPhY4Y1/zWEKvzwNOqUQ3gL7H5LovD+Wx6XngykHea0L02GxSC5xTIZ+hDP4XnxWOgLUpXDz29M1DMvzaRwGpHXUdHAphuVYg1GVrN5FKfV0MEWvyREr8PZ0J0Wdze47yICxYZQ3SIQh5CfJKL2z2ypReNZn+RbpL5dain/2SVUji/U+iMZA+q1xoLFFjnNaixW/pJ5n+0FYq4IeNVRNCPV2JsPibzFFwJTbjVBl7m6ayiO1lMC09MZdJUvvyv0Qs7lHpYdEAjkoni9aXoXeFqR4hTwOXMzj9Z0+l5sDcCBEOsMrBp8FsVDPG6e2NnXp05I26F1HoHBToYOwg+/l5QPW51iqjLPWoNrKqfjUQOUVR8hvAhTNzEoOmut7IZOCdA587ud0R7EADCUDt5OTnGH06SFx5ud3W67S/nXlpIu/VBoM6tXC2xTBh05QdLtuirqb0w51GLJW+saOcOhsgYiDAxdQ759PWuOBtiW42nzXiV9h0WcAJj2z6xWxOPblrYqmYcLAAcXSRLKHZXaZ3T+0VVmF1X2xvV7LX9bIVJCskvEo6/3dlPjaEfNAc438LcNw5fr6BqrqTZEtmAnehOAVn4TdiX4DYlaE0oUQ6nm/s9cyqnQsNtNu8HHYXsIA9iSS2rBMyg5SJyOfo2qAQpVq3t0w9xsTk=
 matrix:

From a05e9839e16b590b5f72cb1b5a3579c6e41a0284 Mon Sep 17 00:00:00 2001
From: Steven Glanzer <sglanzer@ciena.com>
Date: Wed, 23 Nov 2016 16:16:34 -0500
Subject: [PATCH 3/4] Trying more stuff with travis

---
 .travis.yml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f39fef32..86e48928 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 sudo: required
 dist: trusty
+addons:
+  apt:
+    sources:
+    - google-chrome
+    packages:
+    - google-chrome-stable
 language: node_js
 node_js:
 - '6.9'
@@ -8,6 +14,8 @@ branches:
   except:
   - /^v[0-9\.]+/
 before_install:
+- "export DISPLAY=:99.0"
+- "sh -e /etc/init.d/xvfb start"
 - npm config set spin false
 - npm install -g coveralls pr-bumper --ignore-scripts
 - pr-bumper check
@@ -15,15 +23,6 @@ install:
 - npm install ember-cli-sass # NOTE: this requies scripts
 - npm install --ignore-scripts
 - bower install
-before_script:
-- export CHROME_BIN=/usr/bin/google-chrome
-- "export DISPLAY=:99.0"
-- "sh -e /etc/init.d/xvfb start"
-- sleep 3 # give xvfb some time to start
-- sudo apt-get update
-- sudo apt-get install -y libappindicator1 fonts-liberation
-- wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-- sudo dpkg -i google-chrome*.deb
 script:
 - npm run lint
 - ember try:one $EMBER_TRY_SCENARIO --- ember test

From d8aa6747f0468d487b8cd746ad75a9ded58cb186 Mon Sep 17 00:00:00 2001
From: Steven Glanzer <sglanzer@ciena.com>
Date: Wed, 23 Nov 2016 16:24:27 -0500
Subject: [PATCH 4/4] Trying more stuff with travis

---
 .travis.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 86e48928..b0b7b805 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,11 @@ dist: trusty
 addons:
   apt:
     sources:
+    - ubuntu-toolchain-r-test
     - google-chrome
     packages:
     - google-chrome-stable
+    - g++-4.8
 language: node_js
 node_js:
 - '6.9'
@@ -28,13 +30,6 @@ script:
 - ember try:one $EMBER_TRY_SCENARIO --- ember test
 after_success:
 - .travis/publish-coverage.sh
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-4.8
-  firefox: "latest-esr"
 env:
   matrix:
   - EMBER_TRY_SCENARIO=ember-2-3