From 7c15edf6868f918d910da0dc355b692bf715c3c8 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Fri, 18 Oct 2013 14:03:45 -0400 Subject: [PATCH 1/2] Use js-test-tool v0.1.4 --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 2d86689eea..210f9cb772 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -18,6 +18,6 @@ -e git+https://github.com/edx/XBlock.git@cee38a15f#egg=XBlock -e git+https://github.com/edx/codejail.git@0a1b468#egg=codejail -e git+https://github.com/edx/diff-cover.git@v0.2.6#egg=diff_cover --e git+https://github.com/edx/js-test-tool.git@v0.1.3#egg=js_test_tool +-e git+https://github.com/edx/js-test-tool.git@v0.1.4#egg=js_test_tool -e git+https://github.com/edx/django-waffle.git@823a102e48#egg=django-waffle -e git+https://github.com/edx/event-tracking.git@f0211d702d#egg=event-tracking From 04cce630bf3b1bdbf7ba3fb138e0fbfcdb3e1f3a Mon Sep 17 00:00:00 2001 From: Will Daly Date: Fri, 18 Oct 2013 14:07:05 -0400 Subject: [PATCH 2/2] Create reports/javascript so test:js doesn't fail the first time --- rakelib/js_test.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rakelib/js_test.rake b/rakelib/js_test.rake index f962a2c906..e2bf3ca794 100644 --- a/rakelib/js_test.rake +++ b/rakelib/js_test.rake @@ -55,7 +55,7 @@ end namespace :'test:js' do desc "Run the JavaScript tests and print results to the console" - task :run, [:env] => [:clean_test_files, :'assets:coffee'] do |t, args| + task :run, [:env] => [:clean_test_files, :'assets:coffee', JS_REPORT_DIR] do |t, args| if args[:env].nil? puts "Running all test suites. To run a specific test suite, try:" print_js_test_cmds('run')