From 4f61a78436581be42efdd1d1f2b2786c1b33b2bb Mon Sep 17 00:00:00 2001
From: Nick Uraltsev <nick.uraltsev@gmail.com>
Date: Mon, 21 Mar 2016 23:35:15 -0700
Subject: [PATCH 1/2] Fixing issue with Travis

---
 karma.conf.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index ac0286f..298b387 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -16,10 +16,7 @@ module.exports = function(config) {
   var customLaunchers = {};
   var browsers = [];
 
-  if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) {
-    console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.');
-    browsers = ['Firefox', 'Chrome', 'Safari', 'Opera'];
-  } else {
+  if (process.env.SAUCE_USERNAME || process.env.SAUCE_ACCESS_KEY) {
     customLaunchers = {};
 
     var runAll = true;
@@ -99,6 +96,12 @@ module.exports = function(config) {
     }
 
     browsers = Object.keys(customLaunchers);
+  } else if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'false') {
+    console.log('Cannot run on Sauce Labs as encrypted environment variables are not available to PRs. Using PhantomJS.');
+    browsers = ['PhantomJS'];
+  } else {
+    console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.');
+    browsers = ['Firefox', 'Chrome', 'Safari', 'Opera'];
   }
 
   config.set({
@@ -199,7 +202,7 @@ module.exports = function(config) {
       }
     },
 
-    
+
     // Coverage reporting
     coverageReporter: {
       type: 'lcov',

From c622b35f38c3072c3aeb5e51f3a2116e67286e0e Mon Sep 17 00:00:00 2001
From: Nick Uraltsev <nick.uraltsev@gmail.com>
Date: Tue, 22 Mar 2016 23:46:36 -0700
Subject: [PATCH 2/2] Updating configuration to use Firefox for testing PRs

---
 .travis.yml   | 4 ++++
 karma.conf.js | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f2dc19..71c72cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ language: node_js
 email:
   on_failure: change
   on_success: never
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
 after_success:
 - npm run coveralls
 env:
diff --git a/karma.conf.js b/karma.conf.js
index 298b387..2275e47 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -97,8 +97,11 @@ module.exports = function(config) {
 
     browsers = Object.keys(customLaunchers);
   } else if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'false') {
-    console.log('Cannot run on Sauce Labs as encrypted environment variables are not available to PRs. Using PhantomJS.');
-    browsers = ['PhantomJS'];
+    console.log(
+      'Cannot run on Sauce Labs as encrypted environment variables are not available to PRs. ' +
+      'Running on Travis.'
+    );
+    browsers = ['Firefox'];
   } else {
     console.log('Running locally since SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are not set.');
     browsers = ['Firefox', 'Chrome', 'Safari', 'Opera'];