Commit graph

9 commits

Author SHA1 Message Date
Blade Barringer
590eded44a Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert
Conflicts:
	.gitignore
	.travis.yml
2015-01-21 10:37:08 -06:00
Matteo Pagliazzi
263a752abf add mocha tests to travis, remove makefile 2014-01-15 20:11:29 +01:00
Dušan Juretić
431622ce14 E2e tests: launch Selenium and node server and kill them after finishing the tests, using a test database 2014-01-01 14:01:51 -03:00
Dušan Juretić
3c5f9d7f8b Mute Selenium on Travis 2014-01-01 14:01:51 -03:00
Dušan Juretić
462bc416de Starting e2e testing 2014-01-01 14:01:23 -03:00
Dušan Juretić
f4ac5dfe8c fix unit tests 2013-10-31 22:35:35 -03:00
Dušan Juretić
dd79638bac allow any branch in travis builds 2013-10-27 16:23:02 -03:00
Dušan Juretić
479075ac21 add .travis.yml 2013-09-29 11:37:31 -03:00
Tyler Renelle
6708d46107 [#1534] initialize karma tests using generator-karma (yeoman) 2013-09-13 20:00:35 -04:00