rspec 1.2.8 → 1.2.9

data/spec/spec/mocks/stub_chain_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/mocks/stub_implementation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/mocks/stub_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks
@@ -16,7 +16,7 @@ module Spec
         @instance = @class.new
         @stub = Object.new
       end
-      
+
       [:stub!, :stub].each do |method|
         context "using #{method}" do
           it "should return expected value when expected message is received" do
@@ -55,7 +55,7 @@ module Spec
         @instance.msg1.should == 1
         @instance.msg2.should == 2
       end
-      
+
       it "should clear itself when verified" do
         @instance.stub!(:this_should_go).and_return(:blah)
         @instance.this_should_go.should == :blah
@@ -90,7 +90,7 @@ module Spec
         @instance.rspec_verify
         @instance.existing_instance_method.should equal(:original_value)
       end
-      
+
       it "should revert to original class method if there is one" do
         @class.existing_class_method.should equal(:original_value)
         @class.stub!(:existing_class_method).and_return(:mock_value)
@@ -115,7 +115,7 @@ module Spec
         current_value.should == [:yielded_value, :another_value]
         @instance.rspec_verify
       end
-      
+
       it "should yield a specified object and return another specified object" do
         yielded_obj = mock("my mock")
         yielded_obj.should_receive(:foo).with(:bar)
@@ -129,12 +129,12 @@ module Spec
           @mock.something
         end.should throw_symbol(:up)
       end
-      
+
       it "should override a pre-existing stub" do
         @stub.stub!(:existing_instance_method).and_return(:updated_stub_value)
         @stub.existing_instance_method.should == :updated_stub_value
       end
-      
+
       it "should limit " do
         @stub.stub!(:foo).with("bar")
         @stub.should_receive(:foo).with("baz")
@@ -148,7 +148,7 @@ module Spec
         @mock.rspec_verify
       end
     end
-    
+
     describe "A method stub with args" do
       before(:each) do
         @stub = Object.new
@@ -188,10 +188,15 @@ module Spec
           @stub.foo("other")
         end.should raise_error
       end
-      
+
       it "should support options" do
         @stub.stub!(:foo, :expected_from => "bar")
       end
+
+      it "should use 'Stub' in the failure message" do
+        stub = stub('name')
+        expect {stub.foo}.to raise_error(/Stub "name" received/)
+      end
     end
 
   end

data/spec/spec/mocks/stubbed_message_expectations_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks
@@ -17,7 +17,7 @@ module Spec
         m.foo('third')
         lambda do
           m.rspec_verify
-        end.should raise_error(%q|Mock 'mock' expected :foo with ("first") but received it with (["second"], ["third"])|)
+        end.should raise_error(%Q|Mock "mock" received :foo with unexpected arguments\n  expected: ("first")\n       got: (["second"], ["third"])|)
         m.rspec_reset
       end
     end

data/spec/spec/mocks/twice_counts_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/mocks/unstub_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Mocks

data/spec/spec/package/bin_spec_spec.rb

@@ -1,22 +1,16 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/../../ruby_forker'
+require 'spec_helper'
+require 'ruby_forker'
 
 describe "The bin/spec script" do
   include RubyForker
   
   it "should have no warnings" do
-    pending "Hangs on JRuby" if RUBY_PLATFORM =~ /java/
-    location = "#{File.dirname(__FILE__)}/../../../bin/spec"
-
-    output = ruby "-w #{location} --help 2>&1"
+    output = ruby "-w -Ilib bin/spec --help"
     output.should_not =~ /warning/n
   end
   
   it "should show the help w/ no args" do
-    pending "Hangs on JRuby" if RUBY_PLATFORM =~ /java/
-    location = "#{File.dirname(__FILE__)}/../../../bin/spec"
-
-    output = ruby "-w #{location} 2>&1"
+    output = ruby "-w -Ilib bin/spec"
     output.should =~ /^Usage: spec/
   end
 end

data/spec/spec/rake/spectask_spec.rb

@@ -1,5 +1,5 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
-require File.dirname(__FILE__) + '/../../../lib/spec/rake/spectask.rb'
+require 'spec_helper'
+require 'spec/rake/spectask'
 
 module Spec
   module Rake

data/spec/spec/runner/class_and_argument_parser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Runner

data/spec/spec/runner/command_line_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Runner

data/spec/spec/runner/configuration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Runner
@@ -8,27 +8,27 @@ module Spec
           
           describe "#mock_with" do
             it "should default mock framework to rspec" do
-              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/rspec$/
+              config.mock_framework.should =~ /^spec\/adapters\/mock_frameworks\/rspec$/
             end
 
             it "should set rspec mocking explicitly" do
               config.mock_with(:rspec)
-              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/rspec$/
+              config.mock_framework.should =~ /^spec\/adapters\/mock_frameworks\/rspec$/
             end
 
             it "should set mocha" do
               config.mock_with(:mocha)
-              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/mocha$/
+              config.mock_framework.should =~ /^spec\/adapters\/mock_frameworks\/mocha$/
             end
 
             it "should set flexmock" do
               config.mock_with(:flexmock)
-              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/flexmock$/
+              config.mock_framework.should =~ /^spec\/adapters\/mock_frameworks\/flexmock$/
             end
 
             it "should set rr" do
               config.mock_with(:rr)
-              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/rr$/
+              config.mock_framework.should =~ /^spec\/adapters\/mock_frameworks\/rr$/
             end
 
             it "should set an arbitrary adapter module" do
@@ -296,6 +296,15 @@ module Spec
             end
 
           end
+
+          describe "#ignore_backtrace_patterns" do
+            it "adds patterns to ignore in backtrace" do
+              config.ignore_backtrace_patterns /custom_pattern/, /shoulda/, /spork/
+              config.ignored_backtrace_patterns.should include(/custom_pattern/)
+              config.ignored_backtrace_patterns.should include(/shoulda/)
+              config.ignored_backtrace_patterns.should include(/spork/)
+            end
+          end
           
           describe "#predicate_matchers (DEPRECATED)" do
             it "is deprecated" do

data/spec/spec/runner/drb_command_line_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require 'spec_helper'
 
 module Spec
   module Runner

data/spec/spec/runner/example_group_runner_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 module Spec
   module Runner

data/spec/spec/runner/formatter/base_formatter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../../spec_helper"
+require 'spec_helper'
 
 module Spec
   module Runner

data/spec/spec/runner/formatter/base_text_formatter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'spec/runner/formatter/base_text_formatter'
 
 module Spec
@@ -66,6 +66,15 @@ module Spec
             @original_RSPEC_COLOR = ENV['RSPEC_COLOR']
           end
           
+          it "does not colorize when output_to_file? returns true" do
+            out = StringIO.new
+            options = stub('options', :colour => true, :autospec => false)
+            formatter = BaseTextFormatter.new(options,out)
+            formatter.stub!(:output_to_tty?).and_return(true)
+            formatter.stub!(:output_to_file?).and_return(true)
+            formatter.__send__(:colour, 'foo', "\e[32m").should == "foo"
+          end
+          
           it "colorizes when colour? and output_to_tty? return true" do
             out = StringIO.new
             options = stub('options', :colour => true, :autospec => false)

data/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'spec/runner/formatter/failing_example_groups_formatter'
 
 module Spec

data/spec/spec/runner/formatter/failing_examples_formatter_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec_helper'
 require 'spec/runner/formatter/failing_examples_formatter'
 
 module Spec

data/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html

@@ -16,9 +16,6 @@
     font-size: 80%;
   }
   </style>
-</head>
-<body>
-<div class="rspec-report">
   <script type="text/javascript">
     // <![CDATA[
 function moveProgressBar(percentDone) {
@@ -46,7 +43,7 @@ function makeYellow(element_id) {
   </script>
   <style type="text/css">
 #rspec-header {
-  background: #65C400; color: #fff;
+  background: #65C400; color: #fff; height: 4em;
 }
 
 .rspec-report h1 {
@@ -54,15 +51,16 @@ function makeYellow(element_id) {
   padding: 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   font-size: 1.8em;
+  position: absolute;
 }
 
 #summary {
   margin: 0; padding: 5px 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   text-align: right;
-  position: absolute;
   top: 0px;
   right: 0px;
+  float:right;
 }
 
 #summary p {
@@ -165,9 +163,14 @@ a {
 }
 
   </style>
+</head>
+<body>
+<div class="rspec-report">
 
 <div id="rspec-header">
-  <h1>RSpec Code Examples</h1>
+  <div id="label">
+    <h1>RSpec Code Examples</h1>
+  </div>
 
   <div id="summary">
     <p id="totals">&nbsp;</p>
@@ -187,52 +190,50 @@ a {
     <dd class="spec failed">
       <span class="failed_spec_name">should fail when expected message not received</span>
       <div class="failure" id="failure_1">
-        <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:13:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `instance_eval'</pre></div>
-    <pre class="ruby"><code><span class="linenum">11</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
-<span class="linenum">12</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
-<span class="offending"><span class="linenum">13</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
-<span class="linenum">14</span>  <span class="keyword">end</span>
-<span class="linenum">15</span>  </code></pre>
+        <div class="message"><pre>Mock &quot;poke me&quot; expected :poke with (any args) once, but received it 0 times</pre></div>
+        <div class="backtrace"><pre>examples/failing/mocking_example.rb:11:
+spec/spec_helper.rb:42:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:41:
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:</pre></div>
+    <pre class="ruby"><code><span class="linenum">9</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">10</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
+<span class="offending"><span class="linenum">11</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
+<span class="linenum">12</span>  <span class="keyword">end</span>
+<span class="linenum">13</span>  </code></pre>
       </div>
     </dd>
     <script type="text/javascript">moveProgressBar('17.6');</script>
     <dd class="spec failed">
       <span class="failed_spec_name">should fail when messages are received out of order</span>
       <div class="failure" id="failure_2">
-        <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:22:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:16:in `instance_eval'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `instance_eval'</pre></div>
-    <pre class="ruby"><code><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
-<span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
-<span class="offending"><span class="linenum">22</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
-<span class="linenum">23</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">two</span>
-<span class="linenum">24</span>  <span class="keyword">end</span></code></pre>
+        <div class="message"><pre>Mock &quot;one two three&quot; received :three out of order</pre></div>
+        <div class="backtrace"><pre>examples/failing/mocking_example.rb:20:
+spec/spec_helper.rb:42:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:41:
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:</pre></div>
+    <pre class="ruby"><code><span class="linenum">18</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
+<span class="linenum">19</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
+<span class="offending"><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
+<span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">two</span>
+<span class="linenum">22</span>  <span class="keyword">end</span></code></pre>
       </div>
     </dd>
     <script type="text/javascript">moveProgressBar('23.5');</script>
     <dd class="spec failed">
       <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
       <div class="failure" id="failure_3">
-        <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:28:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `instance_eval'</pre></div>
-    <pre class="ruby"><code><span class="linenum">26</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
-<span class="linenum">27</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
-<span class="offending"><span class="linenum">28</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span></span>
-<span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span>
-<span class="linenum">30</span>  <span class="keyword">end</span></code></pre>
+        <div class="message"><pre>Mock &quot;don't talk to me&quot; expected :any_message_at_all with (no args) 0 times, but received it once</pre></div>
+        <div class="backtrace"><pre>examples/failing/mocking_example.rb:27:
+spec/spec_helper.rb:42:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:41:
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:</pre></div>
+    <pre class="ruby"><code><span class="linenum">25</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
+<span class="linenum">26</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span>
+<span class="offending"><span class="linenum">27</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span></span>
+<span class="linenum">28</span>  <span class="keyword">end</span></code></pre>
       </div>
     </dd>
     <script type="text/javascript">moveProgressBar('29.4');</script>
@@ -240,17 +241,16 @@ a {
       <span class="failed_spec_name">has a bug we need to fix</span>
       <div class="failure" id="failure_4">
         <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:33:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:33:in `instance_eval'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `instance_eval'</pre></div>
-    <pre class="ruby"><code><span class="linenum">31</span>
-<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
-<span class="offending"><span class="linenum">33</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
-<span class="linenum">34</span>      <span class="comment"># Actually, no. It's fixed. This will fail because it passes :-)</span>
-<span class="linenum">35</span>      <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">Bug</span><span class="punct">&quot;)</span></code></pre>
+        <div class="backtrace"><pre>examples/failing/mocking_example.rb:31:
+spec/spec_helper.rb:42:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:41:
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:</pre></div>
+    <pre class="ruby"><code><span class="linenum">29</span>
+<span class="linenum">30</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">31</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
+<span class="linenum">32</span>      <span class="comment"># Actually, no. It's fixed. This will fail because it passes :-)</span>
+<span class="linenum">33</span>      <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">Bug</span><span class="punct">&quot;)</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -265,19 +265,19 @@ a {
       <div class="failure" id="failure_5">
         <div class="message"><pre>expected: &quot;RSpec is a\nbehaviour driven development\nframework for Ruby\n&quot;,
      got: &quot;RSpec is a\nbehavior driven development\nframework for Ruby\n&quot; (using ==)
-Diff:
+
+ Diff:
 @@ -1,4 +1,4 @@
  RSpec is a
--behavior driven development
-+behaviour driven development
+-behaviour driven development
++behavior driven development
  framework for Ruby
 </pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:13:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:2:in `instance_eval'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `instance_eval'</pre></div>
+        <div class="backtrace"><pre>examples/failing/diffing_spec.rb:13:
+spec/spec_helper.rb:42:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:41:
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:</pre></div>
     <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
 <span class="linenum">12</span><span class="constant">EOF</span>
 <span class="offending"><span class="linenum">13</span>    <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
@@ -288,29 +288,25 @@ Diff:
     <dd class="spec failed">
       <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
       <div class="failure" id="failure_6">
-        <div class="message"><pre>expected &lt;Animal
+        <div class="message"><pre>
+expected &lt;Animal
 name=bob,
 species=tortoise
 &gt;
-, got &lt;Animal
+
+     got &lt;Animal
 name=bob,
 species=giraffe
 &gt;
- (using .eql?)
-Diff:
-@@ -1,5 +1,5 @@
- &lt;Animal
- name=bob,
--species=giraffe
-+species=tortoise
- &gt;
+
+
+(compared using eql?)
 </pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:34:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:31:in `instance_eval'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `instance_eval'</pre></div>
+        <div class="backtrace"><pre>examples/failing/diffing_spec.rb:34:
+spec/spec_helper.rb:42:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:41:
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:29:</pre></div>
     <pre class="ruby"><code><span class="linenum">32</span>    <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
 <span class="linenum">33</span>    <span class="ident">actual</span>   <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
 <span class="offending"><span class="linenum">34</span>    <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>