diff --git a/lib/autotest/rspec2.rb b/lib/autotest/rspec2.rb index dc8050a65c..8c8728d1b5 100644 --- a/lib/autotest/rspec2.rb +++ b/lib/autotest/rspec2.rb @@ -10,7 +10,10 @@ def initialize super clear_mappings setup_rspec_project_mappings - self.failed_results_re = /^\s*\d\).*\n\s+Failure.*(\n\s+#\s(.*)?:\d+)+$/m + + # Example for Ruby 1.8: http://rubular.com/r/AOXNVDrZpx + # Example for Ruby 1.9: http://rubular.com/r/85ag5AZ2jP + self.failed_results_re = /^\s*\d+\).*\n\s+Failure.*(\n\s+#\s(.*)?:\d+(?::.*)?)+$/m self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m end diff --git a/spec/autotest/failed_results_re_spec.rb b/spec/autotest/failed_results_re_spec.rb index 19b1c16c46..ec8a933dd5 100644 --- a/spec/autotest/failed_results_re_spec.rb +++ b/spec/autotest/failed_results_re_spec.rb @@ -14,7 +14,7 @@ it "matches a failure" do re = Autotest::Rspec2.new.failed_results_re - re =~ example_output - $2.should == __FILE__.sub(File.expand_path('.'),'.') + example_output.should =~ re + example_output[re, 2].should == __FILE__.sub(File.expand_path('.'),'.') end end