Merge pull request #9 from smitcham/master

Fix for failure to rerun after syntax error in system under test
This commit is contained in:
John Bintz 2011-09-27 10:47:30 -07:00
commit cd27ecb5be
3 changed files with 6 additions and 7 deletions

View File

@ -72,12 +72,10 @@ module Guard
else else
UI.info(SOME_SPECS_MESSAGE % paths.join(' ')) UI.info(SOME_SPECS_MESSAGE % paths.join(' '))
end end
failed_files = JasmineHeadlessWebkitRunner.run(paths, @filtered_options)
@files_to_rerun = failed_files || paths
if failed_files = JasmineHeadlessWebkitRunner.run(paths, @filtered_options) failed_files && @files_to_rerun.empty?
@files_to_rerun = failed_files
end
failed_files && failed_files.empty?
end end
def filter_paths(paths) def filter_paths(paths)

View File

@ -24,6 +24,7 @@ module Guard
end end
rescue Jasmine::Headless::InvalidReport => e rescue Jasmine::Headless::InvalidReport => e
Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed) Notifier.notify('Spec runner interrupted!', :title => 'Jasmine results', :image => :failed)
false
rescue Exception => e rescue Exception => e
p e p e
end end

View File

@ -49,7 +49,7 @@ REPORT
it 'should notify failure' do it 'should notify failure' do
Guard::Notifier.expects(:notify).with("Spec runner interrupted!", { :title => 'Jasmine results', :image => :failed }) 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 end
end end