From 70b26b2c088348bf025e0cec67abe4bebec030ac Mon Sep 17 00:00:00 2001 From: Steven Mitcham Date: Fri, 23 Sep 2011 11:54:46 -0500 Subject: [PATCH 1/2] Fixing issue with jasmine headless webkit returning 'true' when a compilation error occurs --- lib/guard/jasmine-headless-webkit.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/guard/jasmine-headless-webkit.rb b/lib/guard/jasmine-headless-webkit.rb index 44d7a4b..85d9977 100644 --- a/lib/guard/jasmine-headless-webkit.rb +++ b/lib/guard/jasmine-headless-webkit.rb @@ -72,9 +72,8 @@ module Guard else UI.info(SOME_SPECS_MESSAGE % paths.join(' ')) end - if failed_files = JasmineHeadlessWebkitRunner.run(paths, @filtered_options) - @files_to_rerun = failed_files + failed_files = @files_to_rerun = failed_files.is_a?(Array) ? failed_files : [] end failed_files && failed_files.empty? From 862b82e8697a32408b7933b1d4fd726eaeb8c976 Mon Sep 17 00:00:00 2001 From: Steven Mitcham Date: Mon, 26 Sep 2011 10:48:14 -0500 Subject: [PATCH 2/2] Fixing the runner to return false on the event of a failure and returning the original set of files in the event of a failure --- lib/guard/jasmine-headless-webkit.rb | 9 ++++----- lib/guard/jasmine-headless-webkit/runner.rb | 1 + spec/lib/guard/jasmine-headless-webkit/runner_spec.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/guard/jasmine-headless-webkit.rb b/lib/guard/jasmine-headless-webkit.rb index 85d9977..6dcee90 100644 --- a/lib/guard/jasmine-headless-webkit.rb +++ b/lib/guard/jasmine-headless-webkit.rb @@ -72,11 +72,10 @@ module Guard else UI.info(SOME_SPECS_MESSAGE % paths.join(' ')) end - if failed_files = JasmineHeadlessWebkitRunner.run(paths, @filtered_options) - failed_files = @files_to_rerun = failed_files.is_a?(Array) ? failed_files : [] - end - - failed_files && failed_files.empty? + failed_files = JasmineHeadlessWebkitRunner.run(paths, @filtered_options) + @files_to_rerun = failed_files || paths + + failed_files && @files_to_rerun.empty? end def filter_paths(paths) diff --git a/lib/guard/jasmine-headless-webkit/runner.rb b/lib/guard/jasmine-headless-webkit/runner.rb index 211b011..6913564 100644 --- a/lib/guard/jasmine-headless-webkit/runner.rb +++ b/lib/guard/jasmine-headless-webkit/runner.rb @@ -24,6 +24,7 @@ module Guard end rescue Jasmine::Headless::InvalidReport => e Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed) + false rescue Exception => e p e end diff --git a/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb b/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb index e01b0b8..a0bac69 100644 --- a/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb +++ b/spec/lib/guard/jasmine-headless-webkit/runner_spec.rb @@ -49,7 +49,7 @@ REPORT it 'should notify failure' do Guard::Notifier.expects(:notify).with("Spec runner interrupted!", { :title => 'Jasmine results', :image => :failed }) - Guard::JasmineHeadlessWebkitRunner.notify(file).should be_nil + Guard::JasmineHeadlessWebkitRunner.notify(file).should be_false end end end