From 5ab2cb0908a7fc365ab2146b8fba24af20e2af5d Mon Sep 17 00:00:00 2001
From: Sean Zellmer <sean@lejeunerenard.com>
Date: Sat, 7 Mar 2015 16:37:35 -0600
Subject: [PATCH] Use PhantomJS and run karma in Travis-CI

---
 karma.conf.js     | 2 +-
 test/run_tests.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 06c2ea78a7..83c9e0a776 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -94,7 +94,7 @@ module.exports = function(config) {
     // - Safari (only Mac)
     // - PhantomJS
     // - IE (only Windows)
-    browsers: ['Firefox'],
+    browsers: ['PhantomJS'],
 
 
     // Continuous Integration mode
diff --git a/test/run_tests.sh b/test/run_tests.sh
index 6c682411ca..43b395c833 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -37,5 +37,7 @@ trap "kill $NODE_PID" EXIT
 NODE_ENV=testing mocha || exit $?
 
 if [ -z "$TRAVIS" ]; then
-	NODE_ENV=testing grunt karma:continuous && ./node_modules/protractor/bin/protractor protractor.conf.js || exit $?
+	NODE_ENV=testing ./node_modules/protractor/bin/protractor protractor.conf.js || exit $?
 fi
+
+NODE_ENV=testing grunt karma:continuous