Use PhantomJS and run karma in Travis-CI

2015-03-07 16:37:35 -06:00
parent b507a0fe3a
commit 5ab2cb0908
2 changed files with 4 additions and 2 deletions
@@ -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