rspec 1.2.0 → 1.2.1

data/spec/spec/matchers/matchers_spec.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+

data/spec/spec/package/bin_spec_spec.rb

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

data/spec/spec/runner/command_line_spec.rb

@@ -106,7 +106,7 @@ module Spec
           options.add_example_group(example_group)
 
           ::Spec::Runner::Options.should_receive(:new).with(@err, @out).and_return(options)
-          options.reporter.should_receive(:add_example_group).with(example_group)
+          options.reporter.should_receive(:add_example_group).with(Spec::Example::ExampleGroupProxy.new(example_group))
         
           Spec::Runner::CommandLine.run(OptionParser.parse([], @err, @out))
         end
@@ -127,7 +127,7 @@ module Spec
             end
           end
 
-          options.reporter.should_receive(:add_example_group).with(example_group)
+          options.reporter.should_receive(:add_example_group).with(Spec::Example::ExampleGroupProxy.new(example_group))
 
           options.add_example_group example_group
           run_with(options)

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

@@ -15,9 +15,9 @@ module Spec
         end
         
         it "should add example name for each failure" do
-          formatter.add_example_group(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 1"))
+          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 1")))
           formatter.example_failed("e 1", nil, Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
-          formatter.add_example_group(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 2"))
+          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 2")))
           formatter.example_failed("e 2", nil, Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           formatter.example_failed("e 3", nil, Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           io.string.should include("b 1")
@@ -29,13 +29,13 @@ module Spec
           child_example_group = Class.new(parent_example_group).describe("#child_method")
           grand_child_example_group = Class.new(child_example_group).describe("GrandChild")
 
-          formatter.add_example_group(grand_child_example_group)
+          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
           formatter.example_failed("failure", nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           io.string.should == "Parent#child_method GrandChild\n"
         end
 
         it "should remove druby url, which is used by Spec::Distributed" do
-          @formatter.add_example_group(Class.new(::Spec::Example::ExampleGroupDouble).describe("something something (druby://99.99.99.99:99)"))
+          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("something something (druby://99.99.99.99:99)")))
           @formatter.example_failed("e 1", nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           io.string.should == "something something\n"
         end

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

@@ -15,9 +15,9 @@ module Spec
           example_group_1 = Class.new(::Spec::Example::ExampleGroupDouble).describe("A")
           example_group_2 = Class.new(example_group_1).describe("B")
 
-          @formatter.add_example_group(example_group_1)
+          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group_1))
           @formatter.example_failed(example_group_1.it("a1"){}, nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
-          @formatter.add_example_group(example_group_2)
+          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group_2))
           @formatter.example_failed(example_group_2.it("b2"){}, nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           @formatter.example_failed(example_group_2.it("b3"){}, nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           @io.string.should eql(<<-EOF

data/spec/spec/runner/formatter/html_formatted-1.8.4.html

@@ -167,7 +167,7 @@ a {
   </style>
 
 <div id="rspec-header">
-  <h1>RSpec Results</h1>
+  <h1>RSpec Code Examples</h1>
 
   <div id="summary">
     <p id="totals">&nbsp;</p>

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

@@ -167,7 +167,7 @@ a {
   </style>
 
 <div id="rspec-header">
-  <h1>RSpec Results</h1>
+  <h1>RSpec Code Examples</h1>
 
   <div id="summary">
     <p id="totals">&nbsp;</p>

data/spec/spec/runner/formatter/html_formatted-1.8.5.html

@@ -167,7 +167,7 @@ a {
   </style>
 
 <div id="rspec-header">
-  <h1>RSpec Results</h1>
+  <h1>RSpec Code Examples</h1>
 
   <div id="summary">
     <p id="totals">&nbsp;</p>

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

@@ -167,7 +167,7 @@ a {
   </style>
 
 <div id="rspec-header">
-  <h1>RSpec Results</h1>
+  <h1>RSpec Code Examples</h1>
 
   <div id="summary">
     <p id="totals">&nbsp;</p>

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

@@ -169,7 +169,7 @@ a {
 
 <div id="rspec-header">
   <div id="label">
-    <h1>RSpec Results</h1>
+    <h1>RSpec Code Examples</h1>
   </div>
 
   <div id="summary">

data/spec/spec/runner/formatter/html_formatted-1.8.7.html

@@ -169,7 +169,7 @@ a {
 
 <div id="rspec-header">
   <div id="label">
-    <h1>RSpec Results</h1>
+    <h1>RSpec Code Examples</h1>
   </div>
 
   <div id="summary">

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

@@ -169,7 +169,7 @@ a {
 
 <div id="rspec-header">
   <div id="label">
-    <h1>RSpec Results</h1>
+    <h1>RSpec Code Examples</h1>
   </div>
 
   <div id="summary">

data/spec/spec/runner/formatter/nested_text_formatter_spec.rb

@@ -18,7 +18,7 @@ module Spec
 
           describe "where ExampleGroup has no superclass with a description" do
             def add_example_group
-              formatter.add_example_group(example_group)
+              formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
             end
 
             before do
@@ -66,7 +66,7 @@ OUT
 
                   describe "and parent ExampleGroups have not been printed" do
                     before do
-                      formatter.add_example_group(child_example_group)
+                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
                     end
 
                     it "should push ExampleGroup name with two spaces of indentation" do
@@ -79,9 +79,9 @@ OUT
 
                   describe "and parent ExampleGroups have been printed" do
                     before do
-                      formatter.add_example_group(example_group)
+                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
                       io.string = ""
-                      formatter.add_example_group(child_example_group)
+                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
                     end
 
                     it "should print only the indented ExampleGroup" do
@@ -101,7 +101,8 @@ OUT
 
                   describe "and parent ExampleGroups have not been printed" do
                     before do
-                      formatter.add_example_group(grand_child_example_group)
+                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
+                      
                     end
 
                     it "should print the entire nested ExampleGroup heirarchy" do
@@ -115,9 +116,9 @@ OUT
 
                   describe "and parent ExampleGroups have been printed" do
                     before do
-                      formatter.add_example_group(child_example_group)
+                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
                       io.string = ""
-                      formatter.add_example_group(grand_child_example_group)
+                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
                     end
 
                     it "should print only the indented ExampleGroup" do
@@ -135,7 +136,7 @@ OUT
                 describe "and parent ExampleGroups have not been printed" do
                   def add_example_group
                     @child_example_group = Class.new(example_group)
-                    formatter.add_example_group(child_example_group)
+                    formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
                   end
 
                   it "should render only the parent ExampleGroup" do
@@ -148,9 +149,9 @@ OUT
                 describe "and parent ExampleGroups have been printed" do
                   def add_example_group
                     @child_example_group = Class.new(example_group)
-                    formatter.add_example_group(example_group)
+                    formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
                     io.string = ""
-                    formatter.add_example_group(child_example_group)
+                    formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
                   end
 
                   it "should not render anything" do
@@ -208,7 +209,7 @@ OUT
                 def add_example_group
                   @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(grand_child_example_group)
+                  formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
                 end
 
                 describe "when having an error" do

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(child_example_group)
+          formatter.add_example_group(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(example_group)
+          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
           formatter.instance_variable_set("@time", Time.now)
           
           15.times do 

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(example_group)
+          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
           @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
           @io.rewind
           @formatter.dump_summary(3, 2, 1, 1)
@@ -98,7 +98,7 @@ EOE
           example = example_group.examples.first
           file = __FILE__
           line = __LINE__ + 2
-          @formatter.add_example_group(example_group)
+          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
           @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
           @formatter.dump_pending
           @io.string.should ==(<<-HERE)

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

@@ -24,7 +24,7 @@ module Spec
             end
 
             def add_example_group
-              formatter.add_example_group(example_group)
+              formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
             end
 
             describe "#dump_summary" do
@@ -76,7 +76,7 @@ module Spec
                 def add_example_group
                   @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(grand_child_example_group)
+                  formatter.add_example_group(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.4.html

@@ -167,7 +167,7 @@ a {
   </style>
 
 <div id="rspec-header">
-  <h1>RSpec Results</h1>
+  <h1>RSpec Code Examples</h1>
 
   <div id="summary">
     <p id="totals">&nbsp;</p>

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

@@ -169,7 +169,7 @@ a {
 
 <div id="rspec-header">
   <div id="label">
-    <h1>RSpec Results</h1>
+    <h1>RSpec Code Examples</h1>
   </div>
 
   <div id="summary">

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

@@ -169,7 +169,7 @@ a {
 
 <div id="rspec-header">
   <div id="label">
-    <h1>RSpec Results</h1>
+    <h1>RSpec Code Examples</h1>
   </div>
 
   <div id="summary">

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

@@ -169,7 +169,7 @@ a {
 
 <div id="rspec-header">
   <div id="label">
-    <h1>RSpec Results</h1>
+    <h1>RSpec Code Examples</h1>
   </div>
 
   <div id="summary">

data/spec/spec/runner/option_parser_spec.rb

@@ -24,6 +24,26 @@ describe "OptionParser" do
     options.filename_pattern.should == "foo"
   end
   
+  it "should accept debugger option" do
+    options = parse(["--debugger"])
+    options.debug.should be_true
+  end
+  
+  it "should accept -u form of debugger option" do
+    options = parse(["-u"])
+    options.debug.should be_true
+  end
+  
+  it "should turn off the debugger option if drb is specified later" do
+    options = parse(["-u", "--drb"])
+    options.debug.should_not be_true
+  end
+  
+  it "should turn off the debugger option if drb is specified first" do
+    options = parse(["--drb", "-u"])
+    options.debug.should_not be_true
+  end
+  
   it "should accept dry run option" do
     options = parse(["--dry-run"])
     options.dry_run.should be_true

data/spec/spec/runner/options_spec.rb

@@ -106,6 +106,12 @@ module Spec
           @options.dry_run.should == false
         end
       end
+      
+      describe "#debug" do
+        it "should default to false" do
+          @options.debug.should == false
+        end
+      end
 
       describe "#context_lines" do
         it "should default to 3" do
@@ -215,6 +221,22 @@ module Spec
         end
       end
 
+      describe "debug option specified" do
+        it "should cause ruby_debug to be required and do nothing" do
+          @options.debug = true
+          @options.should_receive(:require_ruby_debug)
+          @options.run_examples.should be_true
+        end
+      end
+      
+      describe "debug option not specified" do
+        it "should not cause ruby_debug to be required" do
+          @options.debug = false
+          @options.should_not_receive(:require_ruby_debug)
+          @options.run_examples.should be_true
+        end
+      end
+      
       describe "#load_class" do
         it "should raise error when not class name" do
           lambda do
@@ -316,7 +338,7 @@ module Spec
           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("")
+            example = group.new(::Spec::Example::ExampleProxy.new)
             
             @options.run_examples
             example.this

data/spec/spec/runner/reporter_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Runner
     describe Reporter do
-      attr_reader :formatter_output, :options, :backtrace_tweaker, :formatter, :reporter, :example_group
+      attr_reader :formatter_output, :options, :backtrace_tweaker, :formatter, :reporter, :example_group, :example_group_proxy, :example_proxy
       before(:each) do
         @formatter_output = StringIO.new
         @options = Options.new(StringIO.new, StringIO.new)
@@ -13,6 +13,8 @@ module Spec
         options.formatters << formatter
         @reporter = Reporter.new(options)
         @example_group = create_example_group("example_group")
+        @example_group_proxy = Spec::Example::ExampleGroupProxy.new(@example_group)
+        @example_proxy = Spec::Example::ExampleProxy.new
         example_group.notify(reporter)
       end
 
@@ -33,7 +35,7 @@ module Spec
       end
       
       it "should tell formatter when example_group is added" do
-        formatter.should_receive(:add_example_group).with(example_group)
+        formatter.should_receive(:add_example_group).with(example_group_proxy)
         example_group.notify(reporter)
       end
       
@@ -58,13 +60,13 @@ module Spec
       end
       
       def description_of(example)
-        ::Spec::Example::ExampleDescription.new(String === example ? example : example.description)
+        ::Spec::Example::ExampleProxy.new(String === example ? example : example.description)
       end
 
       it "should handle multiple examples with the same name" do
         error=RuntimeError.new
-        passing = ::Spec::Example::ExampleGroupDouble.new("an example")
-        failing = ::Spec::Example::ExampleGroupDouble.new("an example")
+        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_passed).with(description_of(passing)).exactly(2).times
@@ -141,11 +143,11 @@ module Spec
         it "should delegate to backtrace tweaker" do
           formatter.should_receive(:example_failed)
           backtrace_tweaker.should_receive(:tweak_backtrace)
-          reporter.example_finished(description_of(ExampleGroup.new("example")), RuntimeError.new)
+          reporter.example_finished(example_proxy, RuntimeError.new)
         end
       
         it "should account for failing example in stats" do
-          example = ::Spec::Example::ExampleGroupDouble.new("example")
+          example = ::Spec::Example::ExampleGroupDouble.new(example_proxy)
           formatter.should_receive(:example_failed).with(description_of(example), 1, failure)
           formatter.should_receive(:start_dump)
           formatter.should_receive(:dump_pending)
@@ -165,21 +167,21 @@ module Spec
         end
         
         it "should tell formatter example is pending" do
-          example = ExampleGroup.new("example")
+          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)
+          formatter.should_receive(:add_example_group).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")
+          example = ExampleGroup.new(example_proxy)
           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)
+          formatter.should_receive(:add_example_group).with(example_group_proxy)
           example_group.notify(reporter)
           reporter.example_finished(description_of(example), @pending_error)
           reporter.dump
@@ -201,16 +203,17 @@ module Spec
             options.formatters << @deprecated_formatter
           end
           
-          it "should pass the correct example to the formatter" do
-            example = ExampleGroup.new("example")
+          it "should pass the correct example description to the formatter" do
+            description = Spec::Example::ExampleProxy.new("name")
+            example = ExampleGroup.new(description)
             example_group.notify(reporter)
             reporter.example_finished(description_of(example), @pending_error)
             
-            @deprecated_formatter.example_passed_to_method.should == description_of(example)
+            @deprecated_formatter.example_passed_to_method.should == description
           end
           
           it "should pass the correct pending error message to the formatter" do
-            example = ExampleGroup.new("example")
+            example = ExampleGroup.new(example_proxy)
             example_group.notify(reporter)
             reporter.example_finished(description_of(example), @pending_error)
             
@@ -220,7 +223,7 @@ module Spec
           it "should raise a deprecation warning" do
             Kernel.should_receive(:warn).with(Spec::Runner::Reporter::EXAMPLE_PENDING_DEPRECATION_WARNING)
             
-            example = ExampleGroup.new("example")
+            example = ExampleGroup.new(example_proxy)
             example_group.notify(reporter)
             reporter.example_finished(description_of(example), @pending_error)
           end
@@ -232,7 +235,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)
+          formatter.should_receive(:add_example_group).with(example_group_proxy)
           example_group.notify(reporter)
           reporter.example_finished(description_of(example_group.examples.first), Spec::Example::PendingExampleFixedError.new("reason"))
         end