Merge pull request #1178 from MITx/fix/zoldak/cms-jasmine

CMS Jasmine tests are fixed. Fail the Jenkins edge build when CMS Jasmine specs fail.

cms/static/coffee/files.json

@@ -3,6 +3,6 @@
     "/static/js/vendor/jquery.min.js",
     "/static/js/vendor/json2.js",
     "/static/js/vendor/underscore-min.js",
-    "/static/js/vendor/backbone.js"
+    "/static/js/vendor/backbone-min.js"
   ]
 }

jenkins/test_edge.sh

@@ -22,7 +22,7 @@ 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