From b19aa06540e2ecc002b68799d69ee477e6ee267f Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Wed, 19 Dec 2012 11:26:36 -0500 Subject: [PATCH 1/2] Fix broken jasmine tests for CMS. All (11) specs are now passing. --- cms/static/coffee/files.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/static/coffee/files.json b/cms/static/coffee/files.json index 7b2719a047..b396bec944 100644 --- a/cms/static/coffee/files.json +++ b/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" ] } From e21c17ffeb9fb0a1c7ec0ad00f67db3520680d2f Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Wed, 19 Dec 2012 11:32:55 -0500 Subject: [PATCH 2/2] Fail the Jenkins build when CMS Jasmine tests fail. --- jenkins/test_edge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/test_edge.sh b/jenkins/test_edge.sh index 14c3bd5f26..7c8ad8ed83 100755 --- a/jenkins/test_edge.sh +++ b/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