rspec 1.0.5 → 1.0.6

data/spec/spec/runner/extensions/bug_report_10577_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+require 'delegate'
+
+module Bug10577
+  class OCI8
+    def describe(name)
+      "Hello, #{name}"
+    end
+
+    def something(name)
+      "Something, #{name}"
+    end
+  end
+
+  class OCI8AutoRecover < DelegateClass(OCI8)
+    def initialize
+      @connection = OCI8.new
+      super(@connection)
+    end
+  end
+
+  class OCI8AutoRecover
+    def describe(name)
+      @connection.describe(name)
+    end
+  end
+
+  describe Kernel do
+    it "should not mask a delegate class' describe method" do
+      bugger = OCI8AutoRecover.new
+      bugger.describe('aslak').should == "Hello, aslak"
+      bugger.something('aslak').should == "Something, aslak"
+    end
+  end
+end

data/spec/spec/runner/formatter/failing_behaviours_formatter_spec.rb

@@ -8,17 +8,30 @@ module Spec
           @io = StringIO.new
           @formatter = FailingBehavioursFormatter.new(@io)
         end
+        
+        def description(s)
+          Spec::DSL::Description.new(s)
+        end
 
         it "should add example name for each failure" do
-          @formatter.add_behaviour("b 1")
+          @formatter.add_behaviour(description("b 1"))
           @formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
-          @formatter.add_behaviour("b 2")
+          @formatter.add_behaviour(description("b 2"))
           @formatter.example_failed("e 2", nil, Reporter::Failure.new(nil, RuntimeError.new))
           @formatter.example_failed("e 3", nil, Reporter::Failure.new(nil, RuntimeError.new))
           @io.string.should eql(<<-EOF
 b 1
 b 2
 EOF
+)
+        end
+
+        it "should remove druby url, which is used by Spec::Distributed" do
+          @formatter.add_behaviour("something something (druby://99.99.99.99:99)")
+          @formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @io.string.should eql(<<-EOF
+something something
+EOF
 )
         end
       end

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

@@ -11,10 +11,10 @@ module Spec
 
         it "should add example name for each failure" do
           @formatter.add_behaviour("b 1")
-          @formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.example_failed(DSL::Example.new("e 1"), nil, Reporter::Failure.new(nil, RuntimeError.new))
           @formatter.add_behaviour("b 2")
-          @formatter.example_failed("e 2", nil, Reporter::Failure.new(nil, RuntimeError.new))
-          @formatter.example_failed("e 3", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.example_failed(DSL::Example.new("e 2"), nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.example_failed(DSL::Example.new("e 3"), nil, Reporter::Failure.new(nil, RuntimeError.new))
           @io.string.should eql(<<-EOF
 b 1 e 1
 b 2 e 2

data/spec/spec/runner/formatter/html_formatter_spec.rb

@@ -11,7 +11,7 @@ describe "HtmlFormatter" do
       raise "There should be no absolute paths in html_formatted.html!!" if (expected_html =~ /\/Users/n || expected_html =~ /\/home/n)
 
       Dir.chdir(root) do
-        args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/stubbing_example.rb',  'examples/not_yet_implemented_spec.rb', '--format', 'html', opt]
+        args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/stubbing_example.rb',  'examples/pending_example.rb', '--format', 'html', opt]
         err = StringIO.new
         out = StringIO.new
         Spec::Runner::CommandLine.run(

data/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb

@@ -1,21 +1,20 @@
 require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 
 module Spec
-module Runner
-module Formatter
-describe "ProgressBarFormatterDryRun" do
-    before(:each) do
-        @io = StringIO.new
-        @formatter = ProgressBarFormatter.new(@io)
-        @formatter.dry_run = true
-    end
-    it "should not produce summary on dry run" do
-        @formatter.dump_summary(3, 2, 1, 0)
-        @io.string.should eql("")
+  module Runner
+    module Formatter
+      describe ProgressBarFormatter, "dry run" do
+        before(:each) do
+          @io = StringIO.new
+          @formatter = ProgressBarFormatter.new(@io)
+          @formatter.dry_run = true
+        end
       
+        it "should not produce summary on dry run" do
+          @formatter.dump_summary(3, 2, 1, 0)
+          @io.string.should eql("")
+        end
+      end
     end
-  
-end
-end
-end
+  end
 end

data/spec/spec/runner/formatter/progress_bar_formatter_failure_dump_spec.rb

@@ -7,7 +7,7 @@ module Spec
         before(:each) do
           @io = StringIO.new
           @reporter = Reporter.new([ProgressBarFormatter.new(@io)], NoisyBacktraceTweaker.new)
-          @reporter.add_behaviour("context")
+          @reporter.add_behaviour(Spec::DSL::Description.new("context"))
         end
 
         it "should end with line break" do

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

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
   module Runner
     module Formatter
-      describe "ProgressBarFormatter" do
+      describe ProgressBarFormatter do
         before(:each) do
           @io = StringIO.new
           @formatter = ProgressBarFormatter.new(@io)
@@ -14,24 +14,51 @@ module Spec
           @io.string.should eql("\n")
         end
 
-        it "should produce standard summary without not implemented when not implemented has a 0 count" do
+        it "should produce standard summary without pending when pending has a 0 count" do
           @formatter.dump_summary(3, 2, 1, 0)
           @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
         end
         
         it "should produce standard summary" do
-          @formatter.dump_summary(3, 2, 1, 4)
-          @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 not implemented\n")
+          @formatter.example_pending("behaviour", "example", "message")  
+          @io.rewind
+          @formatter.dump_summary(3, 2, 1, 1)
+          @io.string.should eql(%Q|
+Finished in 3 seconds
+
+2 examples, 1 failure, 1 pending
+
+Pending:
+behaviour example (message)
+|)
+        end
+
+        it "should push green dot for passing spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @formatter.colour = true
+          @formatter.example_passed("spec")
+          @io.string.should == "\e[32m.\e[0m"
         end
 
-        it "should push F for failing spec" do
+        it "should push red F for failure spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @formatter.colour = true
+          @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", Spec::Expectations::ExpectationNotMetError.new))
+          @io.string.should eql("\e[31mF\e[0m")
+        end
+
+        it "should push magenta F for error spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @formatter.colour = true
           @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", RuntimeError.new))
-          @io.string.should eql("F")
+          @io.string.should eql("\e[35mF\e[0m")
         end
 
-        it "should push dot for passing spec" do
-          @formatter.example_passed("spec")
-          @io.string.should eql(".")
+        it "should push blue F for fixed pending spec" do
+          @io.should_receive(:tty?).and_return(true)
+          @formatter.colour = true
+          @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", Spec::DSL::PendingFixedError.new))
+          @io.string.should eql("\e[34mF\e[0m")
         end
 
         it "should push nothing on start" do
@@ -54,6 +81,12 @@ EOE
 /tmp/x.rb:3:
 EOE
         end
+        
+        it "should dump pending" do
+          @formatter.example_pending("behaviour", "example", "message")
+          @formatter.dump_pending
+          @io.string.should =~ /Pending\:\nbehaviour example \(message\)\n/
+        end
       end
       
       describe "ProgressBarFormatter outputting to custom out" do

data/spec/spec/runner/formatter/rdoc_formatter_spec.rb

@@ -1,46 +1,46 @@
 require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 
 module Spec
-module Runner
-module Formatter
-describe "RdocFormatter" do
-    before(:each) do
-        @io = StringIO.new
-        @formatter = RdocFormatter.new(@io)
-        @formatter.dry_run = true
-    end
-    it "should produce no summary" do
-        @formatter.dump_summary(nil, nil, nil, nil)
-        @io.string.should be_empty
-      
-    end
-    it "should produce nothing on start dump" do
-        @formatter.start_dump
-        @io.string.should be_empty
-      
-    end
-    it "should push out context" do
-        @formatter.add_behaviour("context")
-        @io.string.should eql("# context\n")
-      
-    end
-    it "should push out failed spec" do
-        @formatter.example_failed("spec", 98, nil)
-        @io.string.should eql("# * spec [98 - FAILED]\n")
-      
-    end
-    it "should push out spec" do
-        @formatter.example_passed("spec")
-        @io.string.should eql("# * spec\n")
-      
-    end
+  module Runner
+    module Formatter
+      describe "RdocFormatter" do
+        before(:each) do
+          @io = StringIO.new
+          @formatter = RdocFormatter.new(@io)
+          @formatter.dry_run = true
+        end
+
+        it "should produce no summary" do
+          @formatter.dump_summary(nil, nil, nil, nil)
+          @io.string.should be_empty
+        end
+
+        it "should produce nothing on start dump" do
+          @formatter.start_dump
+          @io.string.should be_empty
+        end
 
-    it "should push out not implemented spec" do
-        @formatter.example_not_implemented("spec")
-        @io.string.should eql("# * spec [NOT IMPLEMENTED]\n")      
+        it "should push out context" do
+          @formatter.add_behaviour(Spec::DSL::Description.new("context"))
+          @io.string.should eql("# context\n")
+        end
+
+        it "should push out failed spec" do
+          @formatter.example_failed(DSL::Example.new("spec"), 98, nil)
+          @io.string.should eql("# * spec [98 - FAILED]\n")
+        end
+
+        it "should push out spec" do
+          @formatter.example_passed(DSL::Example.new("spec"))
+          @io.string.should eql("# * spec\n")
+        end
+
+        it "should push out not pending example" do
+          @formatter.example_pending("behaviour", "example", "reason")
+          @io.string.should eql("# * behaviour example [PENDING: reason]\n")      
+        end
+
+      end
     end
-  
-end
-end
-end
+  end
 end

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

@@ -1,56 +1,62 @@
 require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 
 module Spec
-module Runner
-module Formatter
-describe "SpecdocFormatter" do
-    before(:each) do
-        @io = StringIO.new
-        @formatter = SpecdocFormatter.new(@io)
-    end
+  module Runner
+    module Formatter
+      describe "SpecdocFormatter" do
+        before(:each) do
+          @io = StringIO.new
+          @formatter = SpecdocFormatter.new(@io)
+        end
 
-    it "should produce standard summary without not implemented when not implemented has a 0 count" do
-        @formatter.dump_summary(3, 2, 1, 0)
-        @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
-    end
+        it "should produce standard summary without pending when pending has a 0 count" do
+          @formatter.dump_summary(3, 2, 1, 0)
+          @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
+        end
 
-    it "should produce standard summary" do
-        @formatter.dump_summary(3, 2, 1, 4)
-        @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 not implemented\n")
-    end
-    
-    it "should push context name" do
-        @formatter.add_behaviour("context")
-        @io.string.should eql("\ncontext\n")
-      
-    end
-    it "should push failing spec name and failure number" do
-        @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", RuntimeError.new))
-        @io.string.should eql("- spec (ERROR - 98)\n")
-      
-    end
-    it "should push nothing on start" do
-        @formatter.start(5)
-        @io.string.should eql("")
-      
-    end
-    it "should push nothing on start dump" do
-        @formatter.start_dump
-        @io.string.should eql("")
-      
-    end
-    it "should push passing spec name" do
-        @formatter.example_passed("spec")
-        @io.string.should eql("- spec\n")
-      
-    end
-    
-    it "should push not implemented spec name" do
-      @formatter.example_not_implemented('spec')
-      @io.string.should eql("- spec (NOT IMPLEMENTED)\n")
+        it "should produce standard summary" do
+          @formatter.dump_summary(3, 2, 1, 4)
+          @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure, 4 pending\n")
+        end
+
+        it "should push context name" do
+          @formatter.add_behaviour(Spec::DSL::Description.new("context"))
+          @io.string.should eql("\ncontext\n")
+        end
+
+        it "should push failing spec name and failure number" do
+          @formatter.example_failed(DSL::Example.new("spec"), 98, Reporter::Failure.new("c s", RuntimeError.new))
+          @io.string.should eql("- spec (ERROR - 98)\n")
+        end
+
+        it "should push nothing on start" do
+          @formatter.start(5)
+          @io.string.should eql("")
+        end
+
+        it "should push nothing on start dump" do
+          @formatter.start_dump
+          @io.string.should eql("")
+        end
+
+        it "should push passing spec name" do
+          @formatter.example_passed(DSL::Example.new("spec"))
+          @io.string.should eql("- spec\n")
+        end
+
+        it "should push pending example name and message" do
+          @formatter.example_pending('behaviour', 'example','reason')
+          @io.string.should eql("- example (PENDING: reason)\n")
+        end
+
+        it "should dump pending" do
+          @formatter.example_pending('behaviour', 'example','reason')
+          @io.rewind
+          @formatter.dump_pending
+          @io.string.should =~ /Pending\:\nbehaviour example \(reason\)\n/
+        end
+
+      end
     end
-  
-end
-end
-end
+  end
 end

data/spec/spec/runner/option_parser_spec.rb

@@ -54,9 +54,9 @@ describe "OptionParser" do
     @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
   end
 
-  it "should print instructions about how to fix bad formatter" do
-    options = parse(["--format", "Custom::BadFormatter"])
-    @err.string.should match(/Couldn't find formatter class Custom::BadFormatter/n)
+  it "should print instructions about how to require missing formatter" do
+    lambda { options = parse(["--format", "Custom::MissingFormatter"]) }.should raise_error(NameError)
+    @err.string.should match(/Couldn't find formatter class Custom::MissingFormatter/n)
   end
 
   it "should print usage to err if no dir specified" do
@@ -133,7 +133,8 @@ describe "OptionParser" do
     options = parse(["--format", "html:test.html"])
     File.should be_exist('test.html')
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
-    FileUtils.rm 'test.html' #rescue nil # Help windows
+    options.formatters[0].close
+    FileUtils.rm 'test.html'
   end
 
   it "should use noisy backtrace tweaker with b option" do
@@ -199,9 +200,9 @@ describe "OptionParser" do
     options.differ_class.should == Custom::Formatter
   end
 
-  it "should print instructions about how to fix bad differ" do
-    options = parse(["--diff", "Custom::BadFormatter"])
-    @err.string.should match(/Couldn't find differ class Custom::BadFormatter/n)
+  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
 
   it "should support --line to identify spec" do
@@ -293,8 +294,8 @@ describe "OptionParser" do
   it "should save config to file when --generate-options is specified" do
     FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts')
     options = parse(["--colour", "--generate-options", "test.spec.opts", "--diff"])
-    File.open('test.spec.opts').read.should == "--colour\n--diff\n"
-    FileUtils.rm 'test.spec.opts' #rescue nil # Help windows
+    IO.read('test.spec.opts').should == "--colour\n--diff\n"
+    FileUtils.rm 'test.spec.opts'
   end
 
   it "should call DrbCommandLine when --drb is specified" do
@@ -322,19 +323,19 @@ describe "OptionParser" do
     end
   end
 
-  it "should not use a runner by default" do
+  it "should use the standard runner by default" do
     options = parse([])
-    options.runner_type.should be_nil
+    options.create_behaviour_runner.class.should equal(Spec::Runner::BehaviourRunner)
   end
 
   it "should use a custom runner when given" do
     options = parse(["--runner", "Custom::BehaviourRunner"])
-    options.runner_type.should equal(Custom::BehaviourRunner)
+    options.create_behaviour_runner.class.should equal(Custom::BehaviourRunner)
   end
 
-  it "should fail when custom runner not found" do
-    parse(["--runner", "whatever"])
-    @err.string.should match(/Couldn't find behaviour runner class/)
+  it "should use a custom runner with extra options" do
+    options = parse(["--runner", "Custom::BehaviourRunner:something"])
+    options.create_behaviour_runner.class.should equal(Custom::BehaviourRunner)
   end
 
   it "should return the correct default behaviour runner" do