Merge pull request #4818 from lejeunerenard/fix-tests

Fixed MongoDB service and added Karma tests to Travis-CI

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - '0.10'
+services:
   - mongodb
 before_script:
   - 'npm install -g grunt-cli mocha'

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

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