Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
CMS Jasmine tests are fixed. Fail the Jenkins edge build when CMS Jasmine specs fail.
This commit is contained in:
chrisndodge
2012-12-19 08:42:08 -08:00
parent 8d15860c66 e21c17ffeb
commit 3ae08d101c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/static/coffee/files.json
View File

@@ -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"
]
}

2
jenkins/test_edge.sh
View File

@@ -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