From 1679f1e31d6f8104b11b9fa3357ed7a5bd814f9b Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Mon, 1 Apr 2013 10:52:11 -0400 Subject: [PATCH 1/2] Enable executing the lms jasmine tests as part of the build --- jenkins/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index 1f5ce70b1b..a1ba6daa9a 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -49,7 +49,7 @@ rake test_common/lib/capa || TESTS_FAILED=1 rake test_common/lib/xmodule || TESTS_FAILED=1 # Don't run the lms jasmine tests for now because # they mostly all fail anyhow -# rake phantomjs_jasmine_lms || true +rake phantomjs_jasmine_lms || TESTS_FAILED=1 rake phantomjs_jasmine_cms || TESTS_FAILED=1 rake phantomjs_jasmine_common/lib/xmodule || TESTS_FAILED=1 From f6b6f16ba5be9c464056016b8126b1d8ad11096c Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Mon, 1 Apr 2013 10:58:00 -0400 Subject: [PATCH 2/2] Update the comments explaining test execution --- jenkins/test.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jenkins/test.sh b/jenkins/test.sh index a1ba6daa9a..edcca840c8 100755 --- a/jenkins/test.sh +++ b/jenkins/test.sh @@ -43,12 +43,14 @@ rake pep8 > pep8.log || cat pep8.log rake pylint > pylint.log || cat pylint.log TESTS_FAILED=0 + +# Run the python unit tests rake test_cms[false] || TESTS_FAILED=1 rake test_lms[false] || TESTS_FAILED=1 rake test_common/lib/capa || TESTS_FAILED=1 rake test_common/lib/xmodule || TESTS_FAILED=1 -# Don't run the lms jasmine tests for now because -# they mostly all fail anyhow + +# Run the jaavascript unit tests rake phantomjs_jasmine_lms || TESTS_FAILED=1 rake phantomjs_jasmine_cms || TESTS_FAILED=1 rake phantomjs_jasmine_common/lib/xmodule || TESTS_FAILED=1