Use PhantomJS and run karma in Travis-CI

This commit is contained in:
Sean Zellmer 2015-03-07 16:37:35 -06:00
parent b507a0fe3a
commit 5ab2cb0908
2 changed files with 4 additions and 2 deletions

View file

@ -94,7 +94,7 @@ module.exports = function(config) {
// - Safari (only Mac)
// - PhantomJS
// - IE (only Windows)
browsers: ['Firefox'],
browsers: ['PhantomJS'],
// Continuous Integration mode

View file

@ -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