Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge

Conflicts: requirements.txt
2013-01-03 10:46:24 -05:00
parent 7229a9cdaf edd9b2bc7b
commit e70db062b2
123 changed files with 7234 additions and 585 deletions
--- a/jenkins/test.sh
+++ b/jenkins/test.sh
@@ -37,7 +37,8 @@ rake test_lms[false] || TESTS_FAILED=1
 rake test_common/lib/capa || TESTS_FAILED=1
 rake test_common/lib/xmodule || TESTS_FAILED=1
 rake phantomjs_jasmine_lms || true
-rake phantomjs_jasmine_cms || true
+rake phantomjs_jasmine_cms || TESTS_FAILED=1
+rake phantomjs_jasmine_common/lib/xmodule || true
 rake coverage:xml coverage:html

 [ $TESTS_FAILED == '0' ]