rspec 1.1.12 → 1.2.0

data/spec/spec/runner/formatter/text_mate_formatted-1.9.1.html

@@ -43,7 +43,7 @@ function makeYellow(element_id) {
   </script>
   <style type="text/css">
 #rspec-header {
-  background: #65C400; color: #fff; height: 42px;
+  background: #65C400; color: #fff; height: 4em;
 }
 
 .rspec-report h1 {
@@ -51,7 +51,7 @@ function makeYellow(element_id) {
   padding: 10px;
   font-family: "Lucida Grande", Helvetica, sans-serif;
   font-size: 1.8em;
-  float: left;
+  position: absolute;
 }
 
 #summary {
@@ -192,14 +192,15 @@ a {
       <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><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb&line=13">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb:13</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:51</a> :in `block (4 levels) in <module:Formatter>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `block (3 levels) in <module:Formatter>'</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>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=49">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> :in `block (4 levels) in <module:Formatter>'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `block (3 levels) in <module:Formatter>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>  it "should fail when expected message not received" do
+<span class="linenum">12</span>    mock = mock("poke me")
+<span class="offending"><span class="linenum">13</span>    mock.should_receive(:poke)</span>
+<span class="linenum">14</span>  end
+<span class="linenum">15</span>  
+<span class="linenum">16</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
       </div>
     </dd>
     <script type="text/javascript">moveProgressBar('17.6');</script>
@@ -208,14 +209,15 @@ a {
       <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><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb&line=22">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb:22</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:51</a> :in `block (4 levels) in <module:Formatter>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `block (3 levels) in <module:Formatter>'</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>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=49">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> :in `block (4 levels) in <module:Formatter>'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `block (3 levels) in <module:Formatter>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>    mock.should_receive(:three).ordered
+<span class="linenum">21</span>    mock.one
+<span class="offending"><span class="linenum">22</span>    mock.three</span>
+<span class="linenum">23</span>    mock.two
+<span class="linenum">24</span>  end
+<span class="linenum">25</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
       </div>
     </dd>
     <script type="text/javascript">moveProgressBar('23.5');</script>
@@ -224,13 +226,15 @@ a {
       <div class="failure" id="failure_3">
         <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (no args) 0 times, but received it once</pre></div>
         <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb&line=29">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb:29</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:51</a> :in `block (4 levels) in <module:Formatter>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `block (3 levels) in <module:Formatter>'</pre></div>
-    <pre class="ruby"><code><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="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 class="offending"><span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span></span>
-<span class="linenum">30</span>  <span class="keyword">end</span></code></pre>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=49">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> :in `block (4 levels) in <module:Formatter>'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `block (3 levels) in <module:Formatter>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">27</span>    mock = mock("don't talk to me")
+<span class="linenum">28</span>    mock.should_not_receive(:any_message_at_all)
+<span class="offending"><span class="linenum">29</span>    mock.any_message_at_all</span>
+<span class="linenum">30</span>  end
+<span class="linenum">31</span>
+<span class="linenum">32</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
       </div>
     </dd>
     <script type="text/javascript">moveProgressBar('29.4');</script>
@@ -239,14 +243,15 @@ a {
       <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><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb&line=33">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/mocking_example.rb:33</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:51</a> :in `block (4 levels) in <module:Formatter>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `block (3 levels) in <module:Formatter>'</pre></div>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=49">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> :in `block (4 levels) in <module:Formatter>'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `block (3 levels) in <module:Formatter>'</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>
+<span class="linenum">32</span>  it "has a bug we need to fix" do
+<span class="offending"><span class="linenum">33</span>    pending "here is the bug" do</span>
+<span class="linenum">34</span>      # Actually, no. It's fixed. This will fail because it passes :-)
+<span class="linenum">35</span>      mock = mock("Bug")
+<span class="linenum">36</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -269,13 +274,15 @@ Diff:
  framework for Ruby
 </pre></div>
         <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/diffing_spec.rb&line=13">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/diffing_spec.rb:13</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:51</a> :in `block (4 levels) in <module:Formatter>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `block (3 levels) in <module:Formatter>'</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>
-<span class="linenum">14</span>  <span class="keyword">end</span></code></pre>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=49">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> :in `block (4 levels) in <module:Formatter>'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `block (3 levels) in <module:Formatter>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">11</span>framework for Ruby
+<span class="linenum">12</span>EOF
+<span class="offending"><span class="linenum">13</span>    usa.should == uk</span>
+<span class="linenum">14</span>  end
+<span class="linenum">15</span>
+<span class="linenum">16</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
       </div>
     </dd>
     <script type="text/javascript">moveProgressBar('41.1');</script>
@@ -300,14 +307,15 @@ Diff:
  &gt;
 </pre></div>
         <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/diffing_spec.rb&line=34">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/examples/failing/diffing_spec.rb:34</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:51</a> :in `block (4 levels) in <module:Formatter>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:47</a> :in `block (3 levels) in <module:Formatter>'</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>
-<span class="linenum">35</span>  <span class="keyword">end</span>
-<span class="linenum">36</span><span class="keyword">end</span></code></pre>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=49">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> :in `block (4 levels) in <module:Formatter>'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb&line=45">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</a> :in `block (3 levels) in <module:Formatter>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">32</span>    expected = Animal.new "bob", "giraffe"
+<span class="linenum">33</span>    actual   = Animal.new "bob", "tortoise"
+<span class="offending"><span class="linenum">34</span>    expected.should eql(actual)</span>
+<span class="linenum">35</span>  end
+<span class="linenum">36</span>end
+<span class="linenum">37</span><span class="comment"># gem install syntax to get syntax highlighting</span></code></pre>
       </div>
     </dd>
   </dl>

data/spec/spec/runner/formatter/{spec_mate_formatter_spec.rb → text_mate_formatter_spec.rb}

@@ -1,10 +1,8 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
-begin
-  require 'nokogiri' # Needed to compare generated with wanted HTML
-rescue LoadError
-  warn "nokogiri not loaded -- skipping TextMateFormatter specs"
-  return
-end
+
+begin # See rescue all the way at the bottom
+
+require 'nokogiri' # Needed to compare generated with wanted HTML
 require 'spec/runner/formatter/text_mate_formatter'
 
 module Spec
@@ -51,10 +49,10 @@ module Spec
         #       Spec::Runner::CommandLine.run(
         #         ::Spec::Runner::OptionParser.parse(args, err, out)
         #       )
-        # 
+        #
         #       seconds = /\d+\.\d+ seconds/
         #       html = out.string.gsub seconds, 'x seconds'
-        # 
+        #
         #       File.open(expected_file, 'w') {|io| io.write(html)}
         #     end
         #   end
@@ -64,7 +62,7 @@ module Spec
            it "should produce HTML identical to the one we designed manually with --diff" do
              produces_html_identical_to_manually_designed_document("--diff") do |html|
                suffix = jruby? ? '-jruby' : ''
-               expected_file = File.dirname(__FILE__) + "/text_mate_formatted-#{::VERSION}#{suffix}.html"
+               expected_file = File.dirname(__FILE__) + "/text_mate_formatted-#{::RUBY_VERSION}#{suffix}.html"
                unless File.file?(expected_file)
                  raise "There is no HTML file with expected content for this platform: #{expected_file}"
                end
@@ -102,3 +100,7 @@ module Spec
     end
   end
 end
+
+rescue LoadError
+  warn "nokogiri not loaded -- skipping TextMateFormatter specs"
+end

data/spec/spec/runner/heckle_runner_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
-unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
+unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM} || Spec::Ruby.version.to_f == 1.9
   require 'spec/runner/heckle_runner'
 
   module Foo

data/spec/spec/runner/heckler_spec.rb

@@ -1,4 +1,4 @@
-unless Spec::Ruby.version.to_f == 1.9
+if Spec::Ruby.version.to_f < 1.9
   require File.dirname(__FILE__) + '/../../spec_helper.rb'
   unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
     require 'spec/runner/heckle_runner'

data/spec/spec/runner/option_parser_spec.rb

@@ -144,19 +144,19 @@ describe "OptionParser" do
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
   end
   
-  it "should use html story formatter when format is h" do
-    options = parse(["--format", "h"])
-    options.story_formatters[0].class.should equal(Spec::Runner::Formatter::Story::HtmlFormatter)
-  end
-  
   it "should use html formatter when format is html" do
     options = parse(["--format", "html"])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
   end
   
-  it "should use html story formatter when format is html" do
-    options = parse(["--format", "html"])
-    options.story_formatters[0].class.should equal(Spec::Runner::Formatter::Story::HtmlFormatter)
+  it "should use base formatter when format is s" do
+    options = parse(["--format", "l"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::BaseFormatter)
+  end
+  
+  it "should use base formatter when format is silent" do
+    options = parse(["--format", "silent"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::BaseFormatter)
   end
   
   it "should use html formatter with explicit output when format is html:test.html" do
@@ -299,7 +299,13 @@ describe "OptionParser" do
     it "should barf when --heckle is specified (and platform is windows)" do
       lambda do
         options = parse(["--heckle", "Spec"])
-      end.should raise_error(StandardError, "Heckle not supported on Windows")
+      end.should raise_error(StandardError, /Heckle is not supported/)
+    end
+  elsif Spec::Ruby.version.to_f == 1.9
+    it "should barf when --heckle is specified (and platform is Ruby 1.9)" do
+      lambda do
+        options = parse(["--heckle", "Spec"])
+      end.should raise_error(StandardError, /Heckle is not supported/)
     end
   else
     it "should heckle when --heckle is specified (and platform is not windows)" do
@@ -320,11 +326,17 @@ describe "OptionParser" do
   end
 
   it "should run parse drb after parsing options" do
-    @parser.stub!(:parse_drb)
-    @parser.should_receive(:parse_drb).with(["--drb"]).and_return(true)
+    @parser.should_receive(:parse_drb).with(no_args).and_return(true)
     options = parse(["--options", File.dirname(__FILE__) + "/spec_drb.opts"])    
   end
 
+  it "should send all the arguments others than --drb back to the parser after parsing options" do
+    Spec::Runner::DrbCommandLine.should_receive(:run).and_return do |options|
+      options.argv.should == ["example_file.rb", "--colour"]
+    end
+    options = parse(["example_file.rb", "--options", File.dirname(__FILE__) + "/spec_drb.opts"])    
+  end
+
   it "should read spaced and multi-line options from file when --options is specified" do
     options = parse(["--options", File.dirname(__FILE__) + "/spec_spaced.opts"])
     options.diff_format.should_not be_nil
@@ -403,4 +415,9 @@ describe "OptionParser" do
     options = parse(["--runner", "Custom::ExampleGroupRunner:something"])
     options.run_examples
   end
+  
+  it "sets options.autospec to true with --autospec" do
+    options = parse(["--autospec"])
+    options.autospec.should be(true)
+  end
 end

data/spec/spec/runner/options_spec.rb

@@ -312,6 +312,40 @@ module Spec
       end
 
       describe "#run_examples" do
+        describe "with global predicate matchers" do
+          it "defines global predicate matcher methods on ExampleMethods" do
+            Spec::Runner.configuration.stub!(:predicate_matchers).and_return({:this => :that?})
+            group = Class.new(::Spec::Example::ExampleGroupDouble).describe("Some Examples")
+            example = group.new("")
+            
+            @options.run_examples
+            example.this
+          end
+          
+          after(:each) do
+            Spec::Example::ExampleMethods.class_eval "undef :this"
+          end
+        end
+        
+        describe "with a mock framework defined as a Symbol" do
+          it "includes Spec::Adapters::MockFramework" do
+            Spec::Runner.configuration.stub!(:mock_framework).and_return('spec/adapters/mock_frameworks/rspec')
+
+            Spec::Example::ExampleMethods.should_receive(:include).with(Spec::Adapters::MockFramework)
+
+            @options.run_examples
+          end
+        end
+        
+        describe "with a mock framework defined as a Module" do
+          it "includes the module in ExampleMethods" do
+            mod = Module.new
+            Spec::Runner.configuration.stub!(:mock_framework).and_return(mod)
+            Spec::Example::ExampleMethods.should_receive(:include).with(mod)
+            @options.run_examples
+          end
+        end
+        
         describe "when not given a custom runner" do
           it "should use the standard" do
             runner = ::Spec::Runner::ExampleGroupRunner.new(@options)

data/spec/spec/runner/reporter_spec.rb

@@ -13,15 +13,15 @@ module Spec
         options.formatters << formatter
         @reporter = Reporter.new(options)
         @example_group = create_example_group("example_group")
-        reporter.add_example_group example_group
+        example_group.notify(reporter)
       end
 
       def failure
-        Mocks::ArgumentConstraints::DuckTypeConstraint.new(:header, :exception)
+        Mocks::ArgumentMatchers::DuckTypeMatcher.new(:header, :exception)
       end
 
-      def create_example_group(description_text)
-        example_group = Spec::Example::ExampleGroup.describe(description_text) do
+      def create_example_group(text)
+        example_group = Spec::Example::ExampleGroup.describe(text) do
           it "should do something" do
           end
         end
@@ -31,12 +31,12 @@ module Spec
       it "should assign itself as the reporter to options" do
         options.reporter.should equal(@reporter)
       end
-
+      
       it "should tell formatter when example_group is added" do
         formatter.should_receive(:add_example_group).with(example_group)
-        reporter.add_example_group(example_group)
+        example_group.notify(reporter)
       end
-
+      
       it "should handle multiple example_groups with same name" do
         formatter.should_receive(:add_example_group).exactly(3).times
         formatter.should_receive(:example_started).exactly(3).times
@@ -45,27 +45,31 @@ module Spec
         formatter.should_receive(:dump_pending)
         formatter.should_receive(:close).with(no_args)
         formatter.should_receive(:dump_summary).with(anything(), 3, 0, 0)
-        reporter.add_example_group(create_example_group("example_group"))
-        reporter.example_started("spec 1")
-        reporter.example_finished("spec 1")
-        reporter.add_example_group(create_example_group("example_group"))
-        reporter.example_started("spec 2")
-        reporter.example_finished("spec 2")
-        reporter.add_example_group(create_example_group("example_group"))
-        reporter.example_started("spec 3")
-        reporter.example_finished("spec 3")
+        create_example_group("example_group").notify(reporter)
+        reporter.example_started(description_of("spec 1"))
+        reporter.example_finished(description_of("spec 1"))
+        create_example_group("example_group").notify(reporter)
+        reporter.example_started(description_of("spec 2"))
+        reporter.example_finished(description_of("spec 2"))
+        create_example_group("example_group").notify(reporter)
+        reporter.example_started(description_of("spec 3"))
+        reporter.example_finished(description_of("spec 3"))
         reporter.dump
       end
+      
+      def description_of(example)
+        ::Spec::Example::ExampleDescription.new(String === example ? example : example.description)
+      end
 
       it "should handle multiple examples with the same name" do
         error=RuntimeError.new
-        passing = ExampleGroup.new("example")
-        failing = ExampleGroup.new("example")
+        passing = ::Spec::Example::ExampleGroupDouble.new("an example")
+        failing = ::Spec::Example::ExampleGroupDouble.new("an example")
 
         formatter.should_receive(:add_example_group).exactly(2).times
-        formatter.should_receive(:example_passed).with(passing).exactly(2).times
-        formatter.should_receive(:example_failed).with(failing, 1, failure)
-        formatter.should_receive(:example_failed).with(failing, 2, failure)
+        formatter.should_receive(:example_passed).with(description_of(passing)).exactly(2).times
+        formatter.should_receive(:example_failed).with(description_of(failing), 1, failure)
+        formatter.should_receive(:example_failed).with(description_of(failing), 2, failure)
         formatter.should_receive(:dump_failure).exactly(2).times
         formatter.should_receive(:start_dump)
         formatter.should_receive(:dump_pending)
@@ -73,13 +77,13 @@ module Spec
         formatter.should_receive(:dump_summary).with(anything(), 4, 2, 0)
         backtrace_tweaker.should_receive(:tweak_backtrace).twice
 
-        reporter.add_example_group(create_example_group("example_group"))
-        reporter.example_finished(passing)
-        reporter.example_finished(failing, error)
+        create_example_group("example_group").notify(reporter)
+        reporter.example_finished(description_of(passing))
+        reporter.example_finished(description_of(failing), error)
 
-        reporter.add_example_group(create_example_group("example_group"))
-        reporter.example_finished(passing)
-        reporter.example_finished(failing, error)
+        create_example_group("example_group").notify(reporter)
+        reporter.example_finished(description_of(passing))
+        reporter.example_finished(description_of(failing), error)
         reporter.dump
       end
 
@@ -90,7 +94,7 @@ module Spec
         formatter.should_receive(:close).with(no_args)
         reporter.dump
       end
-
+      
       it "should push time to formatter" do
         formatter.should_receive(:start).with(5)
         formatter.should_receive(:start_dump)
@@ -103,57 +107,57 @@ module Spec
         reporter.end
         reporter.dump
       end
-
+      
       describe "reporting one passing example" do
         it "should tell formatter example passed" do
           formatter.should_receive(:example_passed)
-          reporter.example_finished("example")
+          reporter.example_finished(description_of("example"))
         end
-
+      
         it "should not delegate to backtrace tweaker" do
           formatter.should_receive(:example_passed)
           backtrace_tweaker.should_not_receive(:tweak_backtrace)
-          reporter.example_finished("example")
+          reporter.example_finished(description_of("example"))
         end
-
+      
         it "should account for passing example in stats" do
           formatter.should_receive(:example_passed)
           formatter.should_receive(:start_dump)
           formatter.should_receive(:dump_pending)
           formatter.should_receive(:dump_summary).with(anything(), 1, 0, 0)
           formatter.should_receive(:close).with(no_args)
-          reporter.example_finished("example")
+          reporter.example_finished(description_of("example"))
           reporter.dump
         end
       end
-
+      
       describe "reporting one failing example" do
         it "should tell formatter that example failed" do
           example = example_group.it("should do something") {}
           formatter.should_receive(:example_failed)
-          reporter.example_finished(example, RuntimeError.new)
+          reporter.example_finished(description_of(example), RuntimeError.new)
         end
-
+      
         it "should delegate to backtrace tweaker" do
           formatter.should_receive(:example_failed)
           backtrace_tweaker.should_receive(:tweak_backtrace)
-          reporter.example_finished(ExampleGroup.new("example"), RuntimeError.new)
+          reporter.example_finished(description_of(ExampleGroup.new("example")), RuntimeError.new)
         end
-
+      
         it "should account for failing example in stats" do
-          example = ExampleGroup.new("example")
-          formatter.should_receive(:example_failed).with(example, 1, failure)
+          example = ::Spec::Example::ExampleGroupDouble.new("example")
+          formatter.should_receive(:example_failed).with(description_of(example), 1, failure)
           formatter.should_receive(:start_dump)
           formatter.should_receive(:dump_pending)
           formatter.should_receive(:dump_failure).with(1, anything())
           formatter.should_receive(:dump_summary).with(anything(), 1, 1, 0)
           formatter.should_receive(:close).with(no_args)
-          reporter.example_finished(example, RuntimeError.new)
+          reporter.example_finished(description_of(example), RuntimeError.new)
           reporter.dump
         end
-
+      
       end
-
+      
       describe "reporting one pending example (ExamplePendingError)" do
         before :each do
           @pending_error = Spec::Example::ExamplePendingError.new("reason")
@@ -162,22 +166,22 @@ module Spec
         
         it "should tell formatter example is pending" do
           example = ExampleGroup.new("example")
-          formatter.should_receive(:example_pending).with(example, "reason", @pending_caller)
+          formatter.should_receive(:example_pending).with(description_of(example), "reason", @pending_caller)
           formatter.should_receive(:add_example_group).with(example_group)
-          reporter.add_example_group(example_group)
-          reporter.example_finished(example, @pending_error)
+          example_group.notify(reporter)
+          reporter.example_finished(description_of(example), @pending_error)
         end
-
+      
         it "should account for pending example in stats" do
           example = ExampleGroup.new("example")
-          formatter.should_receive(:example_pending).with(example, "reason", @pending_caller)
+          formatter.should_receive(:example_pending).with(description_of(example), "reason", @pending_caller)
           formatter.should_receive(:start_dump)
           formatter.should_receive(:dump_pending)
           formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1)
           formatter.should_receive(:close).with(no_args)
           formatter.should_receive(:add_example_group).with(example_group)
-          reporter.add_example_group(example_group)
-          reporter.example_finished(example, @pending_error)
+          example_group.notify(reporter)
+          reporter.example_finished(description_of(example), @pending_error)
           reporter.dump
         end
         
@@ -187,7 +191,7 @@ module Spec
           
             @deprecated_formatter = Class.new(@formatter.class) do
               attr_reader :example_passed_to_method, :message_passed_to_method
-
+      
               def example_pending(example_passed_to_method, message_passed_to_method)
                 @example_passed_to_method = example_passed_to_method
                 @message_passed_to_method = message_passed_to_method
@@ -199,16 +203,16 @@ module Spec
           
           it "should pass the correct example to the formatter" do
             example = ExampleGroup.new("example")
-            reporter.add_example_group(example_group)
-            reporter.example_finished(example, @pending_error)
+            example_group.notify(reporter)
+            reporter.example_finished(description_of(example), @pending_error)
             
-            (@deprecated_formatter.example_passed_to_method == example).should be_true
+            @deprecated_formatter.example_passed_to_method.should == description_of(example)
           end
           
           it "should pass the correct pending error message to the formatter" do
             example = ExampleGroup.new("example")
-            reporter.add_example_group(example_group)
-            reporter.example_finished(example, @pending_error)
+            example_group.notify(reporter)
+            reporter.example_finished(description_of(example), @pending_error)
             
             @deprecated_formatter.message_passed_to_method.should ==  @pending_error.message
           end
@@ -217,20 +221,20 @@ module Spec
             Kernel.should_receive(:warn).with(Spec::Runner::Reporter::EXAMPLE_PENDING_DEPRECATION_WARNING)
             
             example = ExampleGroup.new("example")
-            reporter.add_example_group(example_group)
-            reporter.example_finished(example, @pending_error)
+            example_group.notify(reporter)
+            reporter.example_finished(description_of(example), @pending_error)
           end
         end
       end
-
+      
       describe "reporting one pending example (PendingExampleFixedError)" do
         it "should tell formatter pending example is fixed" do
           formatter.should_receive(:example_failed) do |name, counter, failure|
             failure.header.should == "'example_group should do something' FIXED"
           end
           formatter.should_receive(:add_example_group).with(example_group)
-          reporter.add_example_group(example_group)
-          reporter.example_finished(example_group.examples.first, Spec::Example::PendingExampleFixedError.new("reason"))
+          example_group.notify(reporter)
+          reporter.example_finished(description_of(example_group.examples.first), Spec::Example::PendingExampleFixedError.new("reason"))
         end
       end
     end