rspec 1.2.2 → 1.2.3

data/spec/spec/runner/formatter/profile_formatter_spec.rb

@@ -32,7 +32,7 @@ module Spec
           parent_example_group = Class.new(::Spec::Example::ExampleGroupDouble).describe('Parent')
           child_example_group = Class.new(parent_example_group).describe('Child')
 
-          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
+          formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(child_example_group))
           
           formatter.example_started('when foo')
           Time.stub!(:now).and_return(now+1)
@@ -50,7 +50,7 @@ module Spec
         
         it "should print the top 10 results" do
           example_group = Class.new(::Spec::Example::ExampleGroup).describe("ExampleGroup")
-          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
+          formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group))
           formatter.instance_variable_set("@time", Time.now)
           
           15.times do 
@@ -60,7 +60,26 @@ module Spec
           io.should_receive(:print).exactly(10)
           formatter.start_dump
         end
+
+        it "should have method_missing as private" do
+          ProfileFormatter.private_instance_methods.should include("method_missing")
+        end
+
+        it "should respond_to? all messages" do
+          formatter = ProfileFormatter.new({ }, StringIO.new)
+          formatter.should respond_to(:just_about_anything)
+        end
+
+        it "should respond_to? anything, when given the private flag" do
+          formatter = ProfileFormatter.new({ }, StringIO.new)
+          formatter.respond_to?(:method_missing, true).should be_true
+        end
+
+        it "should not respond_to? method_missing (because it's private)" do
+          formatter = ProfileFormatter.new({ }, StringIO.new)
+          formatter.respond_to?(:method_missing).should be_false
+        end
       end
     end
   end
-end
+end

data/spec/spec/runner/formatter/progress_bar_formatter_spec.rb

@@ -30,7 +30,7 @@ module Spec
             end
           end
           example = example_group.examples.first
-          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
+          @formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group))
           @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
           @io.rewind
           @formatter.dump_summary(3, 2, 1, 1)
@@ -97,8 +97,8 @@ EOE
           end
           example = example_group.examples.first
           file = __FILE__
-          line = __LINE__ + 2
-          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
+          line = __LINE__ - 5
+          @formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group))
           @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
           @formatter.dump_pending
           @io.string.should ==(<<-HERE)
@@ -143,6 +143,27 @@ HERE
           @io.string.should eql("")
         end
       end
+
+      describe ProgressBarFormatter, "method_missing" do
+        it "should have method_missing as private" do
+          ProgressBarFormatter.private_instance_methods.should include("method_missing")
+        end
+
+        it "should respond_to? all messages" do
+          formatter = ProgressBarFormatter.new({ }, StringIO.new)
+          formatter.should respond_to(:just_about_anything)
+        end
+
+        it "should respond_to? anything, when given the private flag" do
+          formatter = ProgressBarFormatter.new({ }, StringIO.new)
+          formatter.respond_to?(:method_missing, true).should be_true
+        end
+
+        it "should not respond_to? method_missing (because it's private)" do
+          formatter = ProgressBarFormatter.new({ }, StringIO.new)
+          formatter.respond_to?(:method_missing).should be_false
+        end
+      end
     end
   end
 end

data/spec/spec/runner/formatter/specdoc_formatter_spec.rb

@@ -20,11 +20,11 @@ module Spec
 
           describe "where ExampleGroup has no superclasss with a description" do
             before do
-              add_example_group
+              example_group_started
             end
 
-            def add_example_group
-              formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
+            def example_group_started
+              formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group))
             end
 
             describe "#dump_summary" do
@@ -39,7 +39,7 @@ module Spec
               end
             end
 
-            describe "#add_example_group" do
+            describe "#example_group_started" do
               it "should push ExampleGroup name" do
                 io.string.should eql("\nExampleGroup\n")
               end
@@ -73,10 +73,10 @@ module Spec
               describe "where ExampleGroup has two superclasses with a description" do
                 attr_reader :child_example_group, :grand_child_example_group
               
-                def add_example_group
+                def example_group_started
                   @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
                   @grand_child_example_group = Class.new(child_example_group).describe("GrandChild ExampleGroup")
-                  formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
+                  formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
                 end
 
                 describe "when having an error" do

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

@@ -192,9 +192,9 @@ 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">./examples/failing/mocking_example.rb:13</a> 
-<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=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:51</a> 
-<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=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_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/text_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:47</a> </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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> 
+<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">./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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</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>
@@ -208,9 +208,9 @@ 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">./examples/failing/mocking_example.rb:22</a> 
-<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=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:51</a> 
-<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=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_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/text_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:47</a> </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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> 
+<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">./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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</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>
@@ -224,9 +224,9 @@ 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">./examples/failing/mocking_example.rb:29</a> 
-<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=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:51</a> 
-<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=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_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/text_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:47</a> </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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> 
+<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">./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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</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>
@@ -239,9 +239,9 @@ 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">./examples/failing/mocking_example.rb:33</a> 
-<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=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:51</a> 
-<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=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_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/text_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:47</a> </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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> 
+<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">./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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</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>
@@ -269,9 +269,9 @@ 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">./examples/failing/diffing_spec.rb:13</a> 
-<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=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:51</a> 
-<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=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_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/text_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:47</a> </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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> 
+<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">./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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</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>
@@ -282,27 +282,24 @@ 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=tortoise
-+species=giraffe
- &gt;
+
+
+(compared using eql?)
 </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">./examples/failing/diffing_spec.rb:34</a> 
-<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=51">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:51</a> 
-<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=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_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/text_mate_formatter_spec.rb&line=47">/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatter_spec.rb:47</a> </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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:49</a> 
+<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">./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">./spec/spec/runner/formatter/text_mate_formatter_spec.rb:45</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/formatter/text_mate_formatter_spec.rb

@@ -49,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

data/spec/spec/runner/option_parser_spec.rb

@@ -35,13 +35,15 @@ describe "OptionParser" do
   end
   
   it "should turn off the debugger option if drb is specified later" do
+    @parser.stub!(:parse_drb).with(no_args).and_return(true)
     options = parse(["-u", "--drb"])
-    options.debug.should_not be_true
+    options.debug.should be_false
   end
   
   it "should turn off the debugger option if drb is specified first" do
+    @parser.stub!(:parse_drb).with(no_args).and_return(true)
     options = parse(["--drb", "-u"])
-    options.debug.should_not be_true
+    options.debug.should be_false
   end
   
   it "should accept dry run option" do
@@ -81,7 +83,7 @@ describe "OptionParser" do
     Spec::Runner::OptionParser.stub!(:spec_command?).and_return(true)
     options = parse([])
     @out.rewind
-    @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
+    @out.read.should match(/Usage: spec \(FILE\(:LINE\)\?\|DIRECTORY\|GLOB\)\+ \[options\]/m)
   end
     
   it "should not print help to stdout if no args and NOT spec_command?" do
@@ -94,7 +96,7 @@ describe "OptionParser" do
   it "should print help to stdout" do
     options = parse(["--help"])
     @out.rewind
-    @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
+    @out.read.should match(/Usage: spec \(FILE\(:LINE\)\?\|DIRECTORY\|GLOB\)\+ \[options\]/m)
   end
   
   it "should print instructions about how to require missing formatter" do
@@ -169,14 +171,14 @@ describe "OptionParser" do
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
   end
   
-  it "should use base formatter when format is s" do
+  it "should use silent formatter when format is s" do
     options = parse(["--format", "l"])
-    options.formatters[0].class.should equal(Spec::Runner::Formatter::BaseFormatter)
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::SilentFormatter)
   end
   
-  it "should use base formatter when format is silent" do
+  it "should use silent formatter when format is silent" do
     options = parse(["--format", "silent"])
-    options.formatters[0].class.should equal(Spec::Runner::Formatter::BaseFormatter)
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::SilentFormatter)
   end
   
   it "should use html formatter with explicit output when format is html:test.html" do
@@ -279,40 +281,87 @@ describe "OptionParser" do
       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
-      options.examples.should be_empty
-      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
+
+    describe 'with the --line flag' do
+      it "should correctly identify the spec" do
+        options = parse([file, "--line", "13"])
+        options.line_number.should == 13
+        options.examples.should be_empty
         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)
+        options.examples.should eql(["d"])
+      end
+
+      it "should fail with error message if specified file is a dir" 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 providing a line number/n)
+      end
+   
+    
+      it "should fail with error message if file does not exist" 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" do
+        options = parse([file, file, "--line", "169"])
+        options.run_examples
+        @err.string.should match(/Only one file can be specified when providing a line number/n)
+      end
+    
+      it "should fail with error message if using simultaneously with --example" do
+        options = parse([file, "--example", "some example", "--line", "169"])
+        options.run_examples
+        @err.string.should match(/You cannot use --example and specify a line number/n)
+      end
     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)
+
+    describe 'with the colon syntax (filename:LINE_NUMBER)' do
+
+      it "should strip the line number from the file name" do
+        options = parse(["#{file}:13"])
+        options.files.should include(file)
+      end
+
+      it "should correctly identify the spec" do
+        options = parse(["#{file}:13"])
+        options.line_number.should == 13
+        options.examples.should be_empty
+        options.run_examples
+        options.examples.should eql(["d"])
+      end
+
+      it "should fail with error message if specified file is a dir" do
+        options = parse(["#{dir}:169"])
+        options.line_number.should == 169
+        options.run_examples
+        @err.string.should match(/You must specify one file, not a directory when providing a line number/n)
+      end
+   
+    
+      it "should fail with error message if file does not exist" do
+        options = parse(["some file:169"])
+        proc do
+          options.run_examples
+        end.should raise_error
+      end
+    
+      it "should fail with error message if more than one files are specified" do
+        options = parse([file, "#{file}:169"])
+        options.run_examples
+        @err.string.should match(/Only one file can be specified when providing a line number/n)
+      end
+    
+      it "should fail with error message if using simultaneously with --example" do
+        options = parse(["#{file}:169", "--example", "some example"])
+        options.run_examples
+        @err.string.should match(/You cannot use --example and specify a line number/n)
+      end
     end
+
   end
   
   if [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
@@ -350,12 +399,31 @@ describe "OptionParser" do
     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
+  it "should send all the arguments other 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 "runs specs locally if no drb is running when --drb is specified" do
+    Spec::Runner::DrbCommandLine.should_receive(:run).and_return(false)
+    options = parse(["example_file.rb", "--options", File.dirname(__FILE__) + "/spec_drb.opts"])    
+    options.__send__(:examples_should_be_run?).should be_true
+  end
+
+  it "says its running specs locally if no drb is running when --drb is specified" do
+    Spec::Runner::DrbCommandLine.should_receive(:run).and_return(false)
+    options = parse(["example_file.rb", "--options", File.dirname(__FILE__) + "/spec_drb.opts"])    
+    options.error_stream.rewind
+    options.error_stream.string.should =~ /Running specs locally/
+  end
+
+  it "does not run specs locally if drb is running when --drb is specified" do
+    Spec::Runner::DrbCommandLine.should_receive(:run).and_return(true)
+    options = parse(["example_file.rb", "--options", File.dirname(__FILE__) + "/spec_drb.opts"])    
+    options.__send__(:examples_should_be_run?).should be_false
+  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"])

data/spec/spec/runner/reporter_spec.rb

@@ -35,12 +35,12 @@ module Spec
       end
       
       it "should tell formatter when example_group is added" do
-        formatter.should_receive(:add_example_group).with(example_group_proxy)
+        formatter.should_receive(:example_group_started).with(example_group_proxy)
         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_group_started).exactly(3).times
         formatter.should_receive(:example_started).exactly(3).times
         formatter.should_receive(:example_passed).exactly(3).times
         formatter.should_receive(:start_dump)
@@ -68,11 +68,11 @@ module Spec
         passing = ::Spec::Example::ExampleGroupDouble.new(example_proxy)
         failing = ::Spec::Example::ExampleGroupDouble.new(example_proxy)
 
-        formatter.should_receive(:add_example_group).exactly(2).times
+        formatter.should_receive(:example_group_started).exactly(2).times
         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(:dump_failure).exactly(2).times 
         formatter.should_receive(:start_dump)
         formatter.should_receive(:dump_pending)
         formatter.should_receive(:close).with(no_args)
@@ -163,38 +163,37 @@ module Spec
       describe "reporting one pending example (ExamplePendingError)" do
         before :each do
           @pending_error = Spec::Example::ExamplePendingError.new("reason")
-          @pending_caller = @pending_error.pending_caller
         end
         
         it "should tell formatter example is pending" do
           example = ExampleGroup.new(example_proxy)
-          formatter.should_receive(:example_pending).with(description_of(example), "reason", @pending_caller)
-          formatter.should_receive(:add_example_group).with(example_group_proxy)
+          formatter.should_receive(:example_pending).with(description_of(example), "reason")
+          formatter.should_receive(:example_group_started).with(example_group_proxy)
           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_proxy)
-          formatter.should_receive(:example_pending).with(description_of(example), "reason", @pending_caller)
+          formatter.should_receive(:example_pending).with(description_of(example), "reason")
           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_proxy)
+          formatter.should_receive(:example_group_started).with(example_group_proxy)
           example_group.notify(reporter)
           reporter.example_finished(description_of(example), @pending_error)
           reporter.dump
         end
         
-        describe "to formatters which have example_pending's arity of 2 (which is now deprecated)" do
+        describe "to formatters which have example_pending's arity of 3 (which is now deprecated)" do
           before :each do
-            Kernel.stub!(:warn).with(Spec::Runner::Reporter::EXAMPLE_PENDING_DEPRECATION_WARNING)
+            Spec.stub!(:warn)
           
             @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)
+              def example_pending(example_passed_to_method, message_passed_to_method, deprecated_third_arg=nil)
                 @example_passed_to_method = example_passed_to_method
                 @message_passed_to_method = message_passed_to_method
               end
@@ -204,12 +203,12 @@ module Spec
           end
           
           it "should pass the correct example description to the formatter" do
-            description = Spec::Example::ExampleProxy.new("name")
-            example = ExampleGroup.new(description)
+            proxy = Spec::Example::ExampleProxy.new("name")
+            example = ExampleGroup.new(proxy)
             example_group.notify(reporter)
             reporter.example_finished(description_of(example), @pending_error)
             
-            @deprecated_formatter.example_passed_to_method.should == description
+            @deprecated_formatter.example_passed_to_method.should == proxy
           end
           
           it "should pass the correct pending error message to the formatter" do
@@ -221,7 +220,7 @@ module Spec
           end
           
           it "should raise a deprecation warning" do
-            Kernel.should_receive(:warn).with(Spec::Runner::Reporter::EXAMPLE_PENDING_DEPRECATION_WARNING)
+            Spec.should_receive(:warn)
             
             example = ExampleGroup.new(example_proxy)
             example_group.notify(reporter)
@@ -235,7 +234,7 @@ module Spec
           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_proxy)
+          formatter.should_receive(:example_group_started).with(example_group_proxy)
           example_group.notify(reporter)
           reporter.example_finished(description_of(example_group.examples.first), Spec::Example::PendingExampleFixedError.new("reason"))
         end