add mocha tests to travis, remove makefile

This commit is contained in:
Matteo Pagliazzi
2014-01-15 20:11:29 +01:00
parent 9db6dd9233
commit 263a752abf
4 changed files with 2 additions and 21 deletions
-1
View File
@@ -1,7 +1,6 @@
--colors
--reporter spec
--timeout 4000
--ignore-leaks
--growl
--debug
--compilers coffee:coffee-script
+1 -1
View File
@@ -17,4 +17,4 @@ NODE_PID=$!
trap "kill $NODE_PID && curl http://localhost:4444/selenium-server/driver/?cmd=shutDownSeleniumServer" EXIT
sleep 3 # Wait for Selenium
grunt karma:continuous && ./node_modules/protractor/bin/protractor protractor.conf.js
mocha && grunt karma:continuous && ./node_modules/protractor/bin/protractor protractor.conf.js