rspec 1.1.3 → 1.1.4

data/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb

@@ -267,11 +267,21 @@ module Spec
             @out.string.should include("  Given a pink dog with 21 legs")
           end
 
+          it 'should document steps that include dollar signs ($)' do
+            @formatter.step_succeeded :given, 'kicks that cost $$amount', 50
+            @out.string.should include("Given kicks that cost $50")
+          end
+
           it 'should document regexp steps with replaced params' do
             @formatter.step_succeeded :given, /a (pink|blue) dog with (.*) legs/, 'pink', 21
             @out.string.should include("  Given a pink dog with 21 legs")
           end
 
+          it 'should document regex steps that include dollar signs ($)' do
+            @formatter.step_succeeded :given, /kicks that cost \$(\d+)/, 50
+            @out.string.should include("Given kicks that cost $50")
+          end
+
           it "should append PENDING for the first pending step" do
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
@@ -302,7 +312,7 @@ module Spec
             @out.string.should include('When I say hey (SKIPPED)')
           end
 
-          it "should append SKIPPED for the a failiure after PENDING" do
+          it "should append SKIPPED for a failure after PENDING" do
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
@@ -310,6 +320,100 @@ module Spec
             @out.string.should include('When I say hey (SKIPPED)')
           end
 
+          it "should print steps which succeeded in green" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_succeeded(:given, 'a context')
+
+            @out.string.should =~ /\e\[32m[\n\s]+Given a context\e\[0m/m
+          end
+
+          it "should print failed steps in red" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_failed(:given, 'a context')
+
+            @out.string.should =~ /\e\[31m[\n\s]+Given a context\e\[0m/m
+          end
+
+          it "should print ' (FAILED)' in red" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_failed(:given, 'a context')
+
+            @out.string.should =~ /\e\[31m \(FAILED\)\e\[0m/
+          end
+
+          it "should print pending steps in yellow" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_pending(:given, 'a context')
+
+            @out.string.should =~ /\e\[33m[\n\s]+Given a context\e\[0m/m
+          end
+
+          it "should print ' (PENDING)' in yellow" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_pending(:given, 'a context')
+
+            @out.string.should =~ /\e\[33m \(PENDING\)\e\[0m/
+          end
+
+          it "should print skipped steps in yellow if the scenario is already pending" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_pending(:given, 'a context')
+            @formatter.step_failed(:when, 'I say hey')
+
+            @out.string.should =~ /\e\[33m[\n\s]+When I say hey\e\[0m/m
+          end
+
+          it "should print ' (SKIPPED)' in yellow if the scenario is already pending" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_pending(:given, 'a context')
+            @formatter.step_failed(:when, 'I say hey')
+
+            @out.string.should =~ /\e\[33m \(SKIPPED\)\e\[0m/
+          end
+
+          it "should print skipped steps in red if the scenario has already failed" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_failed(:given, 'a context')
+            @formatter.step_failed(:when, 'I say hey')
+
+            @out.string.should =~ /\e\[31m[\n\s]+When I say hey\e\[0m/m
+          end
+
+          it "should print ' (SKIPPED)' in red if the scenario has already failed" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('','')
+            @formatter.step_failed(:given, 'a context')
+            @formatter.step_failed(:when, 'I say hey')
+
+            @out.string.should =~ /\e\[31m \(SKIPPED\)\e\[0m/m
+          end
+
           it 'should print some white space after each story' do
             # when
             @formatter.story_ended 'title', 'narrative'

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
+<!DOCTYPE html 
   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -188,10 +188,10 @@ a {
       <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>./failing_examples/mocking_example.rb:13:
-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/failing_examples/mocking_example.rb&line=13">./failing_examples/mocking_example.rb:13</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </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>
@@ -204,10 +204,10 @@ a {
       <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>./failing_examples/mocking_example.rb:22:
-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/failing_examples/mocking_example.rb&line=22">./failing_examples/mocking_example.rb:22</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </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>
@@ -219,15 +219,14 @@ a {
     <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>./failing_examples/mocking_example.rb:28:
-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</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>
+        <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/rspec/failing_examples/mocking_example.rb&line=29">./failing_examples/mocking_example.rb:29</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </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>
       </div>
     </dd>
@@ -236,7 +235,10 @@ 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><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/failing_examples/mocking_example.rb&line=33">./failing_examples/mocking_example.rb:33</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </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>
@@ -259,11 +261,14 @@ a {
 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><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/failing_examples/diffing_spec.rb&line=13">./failing_examples/diffing_spec.rb:13</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </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>
@@ -287,14 +292,14 @@ Diff:
 @@ -1,5 +1,5 @@
  &lt;Animal
  name=bob,
--species=giraffe
-+species=tortoise
+-species=tortoise
++species=giraffe
  &gt;
 </pre></div>
-        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:33:
-./spec/spec/runner/formatter/html_formatter_spec.rb:18:
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:in `chdir'
-./spec/spec/runner/formatter/html_formatter_spec.rb:14:</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/failing_examples/diffing_spec.rb&line=34">./failing_examples/diffing_spec.rb:34</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=50">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:50</a> 
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb&line=46">/Users/david/projects/ruby/rspec/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb:46</a> </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>

data/spec/spec/runner/option_parser_spec.rb

@@ -17,12 +17,12 @@ describe "OptionParser" do
     options = parse(["--pattern", "foo"])
     options.filename_pattern.should == "foo"
   end
-
+  
   it "should accept dry run option" do
     options = parse(["--dry-run"])
     options.dry_run.should be_true
   end
-
+  
   it "should eval and use custom formatter when none of the builtins" do
     options = parse(["--format", "Custom::Formatter"])
     options.formatters[0].class.should be(Custom::Formatter)
@@ -40,17 +40,17 @@ describe "OptionParser" do
     options.formatters[2].where.should eql("foo\\bar")
     options.formatters[3].where.should eql("/foo/bar")
   end
-
+  
   it "should not be verbose by default" do
     options = parse([])
     options.verbose.should be_nil
   end
-
+  
   it "should not use colour by default" do
     options = parse([])
     options.colour.should == false
   end
-
+  
   it "should print help to stdout if no args" do
     pending 'A regression since 1.0.8' do
       options = parse([])
@@ -58,13 +58,13 @@ describe "OptionParser" do
       @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
     end
   end
-
+  
   it "should print help to stdout" do
     options = parse(["--help"])
     @out.rewind
     @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
   end
-
+  
   it "should print instructions about how to require missing formatter" do
     lambda do 
       options = parse(["--format", "Custom::MissingFormatter"]) 
@@ -72,7 +72,7 @@ describe "OptionParser" do
     end.should raise_error(NameError)
     @err.string.should match(/Couldn't find formatter class Custom::MissingFormatter/n)
   end
-
+  
   it "should print version to stdout" do
     options = parse(["--version"])
     @out.rewind
@@ -84,37 +84,37 @@ describe "OptionParser" do
       parse(["--require", "whatever"])
     end.should raise_error(LoadError)
   end
-
+  
   it "should support c option" do
     options = parse(["-c"])
     options.colour.should be_true
   end
-
+  
   it "should support queens colour option" do
     options = parse(["--colour"])
     options.colour.should be_true
   end
-
+  
   it "should support us color option" do
     options = parse(["--color"])
     options.colour.should be_true
   end
-
+  
   it "should support single example with -e option" do
     options = parse(["-e", "something or other"])
     options.examples.should eql(["something or other"])
   end
-
+  
   it "should support single example with -s option (will be removed when autotest supports -e)" do
     options = parse(["-s", "something or other"])
     options.examples.should eql(["something or other"])
   end
-
+  
   it "should support single example with --example option" do
     options = parse(["--example", "something or other"])
     options.examples.should eql(["something or other"])
   end
-
+  
   it "should read several example names from file if --example is given an existing file name" do
     options = parse(["--example", File.dirname(__FILE__) + '/examples.txt'])
     options.examples.should eql([
@@ -126,27 +126,27 @@ describe "OptionParser" do
     options = parse(["--example", File.dirname(__FILE__) + '/empty_file.txt'])
     options.examples.should eql([])
   end
-
+  
   it "should use html formatter when format is h" do
     options = parse(["--format", "h"])
     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)
   end
-
+  
   it "should use html formatter with explicit output when format is html:test.html" do
     FileUtils.rm 'test.html' if File.exist?('test.html')
     options = parse(["--format", "html:test.html"])
@@ -156,69 +156,79 @@ describe "OptionParser" do
     options.formatters[0].close
     FileUtils.rm 'test.html'
   end
-
+  
   it "should use noisy backtrace tweaker with b option" do
     options = parse(["-b"])
     options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker)
   end
-
+  
   it "should use noisy backtrace tweaker with backtrace option" do
     options = parse(["--backtrace"])
     options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker)
   end
-
+  
   it "should use quiet backtrace tweaker by default" do
     options = parse([])
     options.backtrace_tweaker.should be_instance_of(Spec::Runner::QuietBacktraceTweaker)
   end
-
+  
   it "should use progress bar formatter by default" do
     options = parse([])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::ProgressBarFormatter)
   end
-
+  
   it "should use specdoc formatter when format is s" do
     options = parse(["--format", "s"])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter)
   end
-
+  
   it "should use specdoc formatter when format is specdoc" do
     options = parse(["--format", "specdoc"])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter)
   end
 
+  it "should use nested text formatter when format is s" do
+    options = parse(["--format", "n"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::NestedTextFormatter)
+  end
+
+  it "should use nested text formatter when format is nested" do
+    options = parse(["--format", "nested"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::NestedTextFormatter)
+  end
+  
   it "should support diff option when format is not specified" do
     options = parse(["--diff"])
     options.diff_format.should == :unified
   end
-
+  
   it "should use unified diff format option when format is unified" do
     options = parse(["--diff", "unified"])
     options.diff_format.should == :unified
     options.differ_class.should equal(Spec::Expectations::Differs::Default)
   end
-
+  
   it "should use context diff format option when format is context" do
     options = parse(["--diff", "context"])
     options.diff_format.should == :context
     options.differ_class.should == Spec::Expectations::Differs::Default
   end
-
+  
   it "should use custom diff format option when format is a custom format" do
     Spec::Expectations.differ.should_not be_instance_of(Custom::Differ)
-
+  
     options = parse(["--diff", "Custom::Differ"])
     options.parse_diff "Custom::Differ"
     options.diff_format.should == :custom
     options.differ_class.should == Custom::Differ
     Spec::Expectations.differ.should be_instance_of(Custom::Differ)
   end
-
+  
   it "should print instructions about how to fix missing differ" do
     lambda { parse(["--diff", "Custom::MissingFormatter"]) }.should raise_error(NameError)
     @err.string.should match(/Couldn't find differ class Custom::MissingFormatter/n)
   end
-
+  
   describe "when attempting a focussed spec" do
     attr_reader :file, :dir
     before do
@@ -226,18 +236,18 @@ describe "OptionParser" do
       @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb"
       @dir = File.dirname(file)
     end
-
+  
     after do
       $rspec_options = @original_rspec_options
     end
-
+  
     def parse(args)
       options = super
       $rspec_options = options
       options.filename_pattern = "*_fixture.rb"
       options
     end
-
+  
     it "should support --line to identify spec" do
       options = parse([file, "--line", "13"])
       options.line_number.should == 13
@@ -245,34 +255,34 @@ describe "OptionParser" do
       options.run_examples
       options.examples.should eql(["d"])
     end
-
+  
     it "should fail with error message if file is dir along with --line" do
       options = parse([dir, "--line", "169"])
       options.line_number.should == 169
       options.run_examples
       @err.string.should match(/You must specify one file, not a directory when using the --line option/n)
     end
-
+  
     it "should fail with error message if file does not exist along with --line" do
       options = parse(["some file", "--line", "169"])
       proc do
         options.run_examples
       end.should raise_error
     end
-
+  
     it "should fail with error message if more than one files are specified along with --line" do
       options = parse([file, file, "--line", "169"])
       options.run_examples
       @err.string.should match(/Only one file can be specified when using the --line option/n)
     end
-
+  
     it "should fail with error message if --example and --line are used simultaneously" do
       options = parse([file, "--example", "some example", "--line", "169"])
       options.run_examples
       @err.string.should match(/You cannot use both --line and --example/n)
     end
   end
-
+  
   if [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
     it "should barf when --heckle is specified (and platform is windows)" do
       lambda do
@@ -285,18 +295,24 @@ describe "OptionParser" do
       options.heckle_runner.should be_instance_of(Spec::Runner::HeckleRunner)
     end
   end
-
+  
   it "should read options from file when --options is specified" do
     options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"])
     options.diff_format.should_not be_nil
     options.colour.should be_true
   end
-
+  
   it "should default the formatter to ProgressBarFormatter when using options file" do
     options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"])
     options.formatters.first.should be_instance_of(::Spec::Runner::Formatter::ProgressBarFormatter)
   end
 
+  it "should run parse drb after parsing options" do
+    @parser.stub!(:parse_drb)
+    @parser.should_receive(:parse_drb).with(["--drb"]).and_return(true)
+    options = parse(["--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
@@ -310,14 +326,14 @@ describe "OptionParser" do
     IO.read('test.spec.opts').should == "--colour\n--diff\n"
     FileUtils.rm 'test.spec.opts'
   end
-
+  
   it "should save config to file when -G is specified" do
     FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts')
     options = parse(["--colour", "-G", "test.spec.opts", "--diff"])
     IO.read('test.spec.opts').should == "--colour\n--diff\n"
     FileUtils.rm 'test.spec.opts'
   end
-
+  
   it "when --drb is specified, calls DrbCommandLine all of the other ARGV arguments" do
     options = Spec::Runner::OptionParser.parse([
       "some/spec.rb", "--diff", "--colour"
@@ -331,7 +347,7 @@ describe "OptionParser" do
   it "should reverse spec order when --reverse is specified" do
     options = parse(["some/spec.rb", "--reverse"])
   end
-
+  
   it "should set an mtime comparator when --loadby mtime" do
     options = parse(["--loadby", 'mtime'])
     runner = Spec::Runner::ExampleGroupRunner.new(options)
@@ -339,7 +355,7 @@ describe "OptionParser" do
       with(options).
       and_return(runner)
     runner.should_receive(:load_files).with(["most_recent_spec.rb", "command_line_spec.rb"])
-
+  
     Dir.chdir(File.dirname(__FILE__)) do
       options.files << 'command_line_spec.rb'
       options.files << 'most_recent_spec.rb'
@@ -348,7 +364,7 @@ describe "OptionParser" do
       FileUtils.rm "most_recent_spec.rb"
     end
   end
-
+  
   it "should use the standard runner by default" do
     runner = ::Spec::Runner::ExampleGroupRunner.new(@parser.options)
     ::Spec::Runner::ExampleGroupRunner.should_receive(:new).
@@ -357,7 +373,7 @@ describe "OptionParser" do
     options = parse([])
     options.run_examples
   end
-
+  
   it "should use a custom runner when given" do
     runner = Custom::ExampleGroupRunner.new(@parser.options, nil)
     Custom::ExampleGroupRunner.should_receive(:new).
@@ -366,7 +382,7 @@ describe "OptionParser" do
     options = parse(["--runner", "Custom::ExampleGroupRunner"])
     options.run_examples
   end
-
+  
   it "should use a custom runner with extra options" do
     runner = Custom::ExampleGroupRunner.new(@parser.options, 'something')
     Custom::ExampleGroupRunner.should_receive(:new).