rspec 0.5.2 → 0.5.3

data/lib/spec/runner/specification.rb

@@ -7,7 +7,6 @@ module Spec
         @block = block
         @mocks = []
         @errors = []
-        @calling_line = caller(0)[2].split(":in")[0]
       end
     
       def run(reporter=nil, setup_block=nil, teardown_block=nil)
@@ -28,7 +27,7 @@ module Spec
           @errors << e
         end
 
-        reporter.add_spec(@name, @calling_line, @errors) unless reporter.nil?
+        reporter.add_spec(@name, @errors) unless reporter.nil?
       end
     
       def run_docs(reporter)

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR = 0
       MINOR = 5
-      TINY  = 2
+      TINY  = 3
 
       STRING = [MAJOR, MINOR, TINY].join('.')
 

data/test/{rake → rcov}/rcov_testtask.rb

@@ -1,9 +1,9 @@
-module Rake
-  class TestTask < TaskLib
+module RCov
+  class TestTask < Rake::TestTask
     def define
       lib_path = @libs.join(File::PATH_SEPARATOR)
-      desc "Run tests" + (@name==:test ? "" : " for #{@name}")
-      task @name do
+      desc "Run tests with rcov"
+      task 'test_with_rcov' do
         run_code = ''
         RakeFileUtils.verbose(@verbose) do
           run_code =

data/test/rcov/rcov_verify.rb

@@ -0,0 +1,28 @@
+module RCov
+  class VerifyTask < Rake::TaskLib
+    attr_accessor :name
+    attr_accessor :index_html
+    attr_accessor :threshold
+    
+    def initialize(name=:rcov_verify)
+      @name = name
+      yield self if block_given?
+      raise "Threshold must be set" if @threshold.nil?
+      define
+    end
+    
+    def define
+      desc "Verify that rcov coverage is at least #{threshold}"
+      task @name do
+        total_coverage = nil
+        File.open(index_html).each_line do |line|
+          if line =~ /<tt>(\d+\.\d+)%<\/tt>&nbsp;<\/td>/
+            total_coverage = eval($1)
+            break
+          end
+        end
+        raise "Coverage must be at least #{threshold}% but was #{total_coverage}%" if total_coverage < threshold
+      end
+    end
+  end
+end

data/test/spec/api/duck_type_test.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Api
+    class DuckTypeTest < Test::Unit::TestCase
+      
+      def test_should_talk_like_something_with_one_message_specified
+        duck_type = DuckType.new(:length)
+        assert(duck_type.walks_like? [])
+      end
+
+      def test_should_talk_like_something_with_two_messages_specified
+        duck_type = DuckType.new(:length, :empty?)
+        assert(duck_type.walks_like? [])
+      end
+
+    end
+  end
+end

data/test/spec/api/mock_arg_constraints_test.rb

@@ -44,6 +44,18 @@ module Spec
         @mock.__verify
       end
       
+      def test_should_process_duck_type_with_one_method
+        @mock.should.receive(:random_call).with(DuckType.new(:length))
+        @mock.random_call([])
+        @mock.__verify
+      end
+      
+      def test_should_process_duck_type_with_two_methods
+        @mock.should.receive(:random_call).with(DuckType.new(:abs, :div))
+        @mock.random_call(1)
+        @mock.__verify
+      end
+      
     end
     
     class FailingConstraintsTest < Test::Unit::TestCase
@@ -76,6 +88,14 @@ module Spec
         end
       end
       
+      def test_should_reject_goose_when_expecting_a_duck
+        @mock.should.receive(:random_call).with(DuckType.new(:abs, :div))
+        assert_raise(MockExpectationError) do
+          @mock.random_call("I don't respond to :abs or :div")
+          @mock.__verify
+        end
+      end
+      
     end
   end
 end

data/test/spec/runner/backtrace_tweaker_test.rb

@@ -2,18 +2,26 @@ require File.dirname(__FILE__) + '/../../test_helper'
 module Spec
   module Runner
     class BacktraceTweakerTest < Test::Unit::TestCase
+      def setup
+        @error = RuntimeError.new
+        @tweaker = BacktraceTweaker.new
+      end
+      
       def test_should_not_barf_on_nil_backtrace
-        error = RuntimeError.new
-        tweaker = BacktraceTweaker.new
-        proc { tweaker.tweak_backtrace error, 'spec name' }.should.not.raise
+        proc { @tweaker.tweak_backtrace @error, 'spec name' }.should.not.raise
       end
       
       def test_should_remove___instance_exec
-        error = RuntimeError.new
-        error.set_backtrace ["./examples/airport_spec.rb:28:in `__instance_exec_1014688_1661744'"]
-        tweaker = BacktraceTweaker.new
-        tweaker.tweak_backtrace error, 'spec name'
-        error.backtrace[0].should.equal "./examples/airport_spec.rb:28:in `spec name'"
+        @error.set_backtrace ["./examples/airport_spec.rb:28:in `__instance_exec_1014688_1661744'"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace[0].should.equal "./examples/airport_spec.rb:28:in `spec name'"
+      end
+      
+      def test_should_remove_helpers
+        @error = RuntimeError.new
+        @error.set_backtrace ["/lib/spec/api/helper/any_helper.rb"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace.should.be.empty
       end
     end
   end

data/test/spec/runner/context_runner_test.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/../../test_helper'
+
 module Spec
   module Runner
     class ContextRunnerTest < Test::Unit::TestCase
@@ -21,19 +22,18 @@ module Spec
         context2 = Api::Mock.new "context2"
         context1.should.receive(:run)
         context2.should.receive(:run)
-        runner = ContextRunner.new [], false, StringIO.new
+        runner = ContextRunner.new ["-o","stringio"], false, StringIO.new
         runner.add_context context1
         runner.add_context context2        
         runner.run
         context1.__verify
         context2.__verify
       end
-      
 
       def test_should_call_run_for_standalone
         context1 = Api::Mock.new "context1"
         context1.should.receive(:run)
-        runner = ContextRunner.standalone context1
+        runner = ContextRunner.standalone context1, ["-o","stringio"]
         context1.__verify
       end
       

data/test/spec/runner/context_test.rb

@@ -10,7 +10,7 @@ module Spec
       end
       
       def test_should_add_itself_to_listener_on_run
-        @listener.should.receive(:add_context).with "context", :anything
+        @listener.should.receive(:add_context).with "context"
         @context.run(@listener)
         @listener.__verify
       end
@@ -23,7 +23,7 @@ module Spec
       
       def test_spec
         @listener.should.receive(:add_context).with :any_args
-        @listener.should.receive(:add_spec).with "test", :anything, :anything
+        @listener.should.receive(:add_spec).with "test", :anything
         $spec_ran = false
         @context.specify("test") {$spec_ran = true}
         @context.run(@listener)

data/test/spec/runner/execution_context_test.rb

@@ -15,6 +15,13 @@ module Spec
           ExecutionContext.new(nil).violated
         end
       end
+      
+      def test_duck_type
+        ec = ExecutionContext.new(Api::Mock.new("spec", :null_object => true))
+        duck_type = ec.duck_type(:length)
+        assert(duck_type.is_a? Api::DuckType)
+        assert(duck_type.walks_like? [])
+      end
     end
   end
 end

data/test/spec/runner/option_parser_test.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../../test_helper'
-require 'stringio'
 
 module Spec
   module Runner
@@ -10,11 +9,17 @@ module Spec
         @err = StringIO.new
       end
 
-      def test_should_print_version
+      def test_should_print_version_to_stdout
         options = OptionParser.parse(["--version"], false, @err, @out)
         @out.rewind
         assert_match(/RSpec-\d+\.\d+\.\d+ - BDD for Ruby\nhttp:\/\/rspec.rubyforge.org\/\n/n, @out.read)
       end
+
+      def test_should_print_help_to_stdout
+        options = OptionParser.parse(["--help"], false, @err, @out)
+        @out.rewind
+        assert_match(/Usage: spec \[options\] \(FILE\|DIRECTORY\)\+/n, @out.read)
+      end
       
       def test_verbose_should_be_true_by_default
         options = OptionParser.parse([], false, @err, @out)
@@ -60,6 +65,11 @@ module Spec
         options = OptionParser.parse([], false, @err, @out)
         assert_match(/Usage: spec/, @err.string)
       end
+      
+      def test_out_should_be_stringio_if_set_to_stringio
+        options = OptionParser.parse(["-o","stringio"], false, @err, @out)
+        options.out.should.be.an.instance.of StringIO
+      end
     end
   end
 end

data/test/spec/runner/simple_text_reporter_test.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../../test_helper'
-require 'stringio'
 
 module Spec
   module Runner
@@ -25,21 +24,21 @@ module Spec
       end
   
       def test_should_account_for_context_in_stats_for_pass
-        @reporter.add_context "context", "calling line"
+        @reporter.add_context "context"
         @reporter.dump
         assert_match(/1 context, 0 specifications, 0 failures/, @io.string)
       end
   
       def test_should_account_for_spec_in_stats_for_pass
-        @reporter.add_spec Specification.new("spec"), "calling line", {}
+        @reporter.add_spec Specification.new("spec"), {}
         @reporter.dump
         assert_match(/0 contexts, 1 specification, 0 failures/, @io.string)
       end
   
       def test_should_account_for_spec_and_error_in_stats_for_pass
         @backtrace_tweaker.should.receive(:tweak_backtrace)
-        @reporter.add_context "context", "calling line"
-        @reporter.add_spec Specification.new("spec"), "calling line", [RuntimeError.new]
+        @reporter.add_context "context"
+        @reporter.add_spec Specification.new("spec"), [RuntimeError.new]
         @reporter.dump
         assert_match(/1 context, 1 specification, 1 failure/, @io.string)
       end
@@ -54,59 +53,31 @@ module Spec
   
       def test_should_handle_multiple_specs_same_name
         @backtrace_tweaker.should.receive(:tweak_backtrace)
-        @reporter.add_context "context", "calling line"
-        @reporter.add_spec "spec", "calling line"
-        @reporter.add_spec "spec", "calling line", [RuntimeError.new]
-        @reporter.add_context "context", "calling line"
-        @reporter.add_spec "spec", "calling line"
-        @reporter.add_spec "spec", "calling line", [RuntimeError.new]
+        @reporter.add_context "context"
+        @reporter.add_spec "spec"
+        @reporter.add_spec "spec", [RuntimeError.new]
+        @reporter.add_context "context"
+        @reporter.add_spec "spec"
+        @reporter.add_spec "spec", [RuntimeError.new]
         @reporter.dump
         assert_match(/2 contexts, 4 specifications, 2 failures/, @io.string)
       end
       
       def test_should_delegate_to_backtrace_tweaker
         @backtrace_tweaker.should.receive(:tweak_backtrace)
-        @reporter.add_context "context", "calling line"
-        @reporter.add_spec "spec", "calling line", [RuntimeError.new]
+        @reporter.add_context "context"
+        @reporter.add_spec "spec", [RuntimeError.new]
         @backtrace_tweaker.__verify
       end
 
     end
-    
-    class FailureDumpTest < Test::Unit::TestCase
-
-      def setup
-        @io = StringIO.new
-        @reporter = SimpleTextReporter.new(@io)
-        @reporter.add_context "failing context", "calling line for context"
-        @reporter.add_spec "failing spec", "calling line for spec", [RuntimeError.new]
-        @reporter.dump
-      end
-
-      def test_should_include_context
-        assert_match(/failing context/, @io.string)
-      end
-
-      def test_should_include_context_calling_line
-        assert_match(/\[calling line for context\]/, @io.string)
-      end
-
-      def test_should_include_spec
-        assert_match(/failing spec/, @io.string)
-      end
-      
-      def test_should_include_spec_calling_line
-        assert_match(/[calling line for spec]/, @io.string)
-      end
-      
-    end
 
     class SimpleTextReporterQuietOutputTest < Test::Unit::TestCase
 
       def setup
         @io = StringIO.new
         @reporter = SimpleTextReporter.new(@io)
-        @reporter.add_context "context", "calling line for context"
+        @reporter.add_context "context"
       end
       
       def test_should_remain_silent_when_context_name_provided
@@ -114,12 +85,12 @@ module Spec
       end
       
       def test_should_output_dot_when_spec_passed
-        @reporter.add_spec "spec", "calling line"
+        @reporter.add_spec "spec"
         assert_equal("\n.", @io.string)
       end
 
       def test_should_output_F_when_spec_failed
-        @reporter.add_spec "spec", "calling line", [RuntimeError.new]
+        @reporter.add_spec "spec", [RuntimeError.new]
         assert_equal("\nF", @io.string)
       end
       
@@ -130,7 +101,7 @@ module Spec
       def setup
         @io = StringIO.new
         @reporter = SimpleTextReporter.new(@io, true)
-        @reporter.add_context "context", "calling line for context"
+        @reporter.add_context "context"
       end
       
       def test_should_output_when_context_name_provided
@@ -138,12 +109,12 @@ module Spec
       end
       
       def test_should_output_spec_name_when_spec_passed
-        @reporter.add_spec "spec", "calling line"
+        @reporter.add_spec "spec"
         assert_match(/- spec\n/, @io.string)
       end
 
       def test_should_output_failure_when_spec_failed
-        @reporter.add_spec "spec", "calling line", [RuntimeError.new]
+        @reporter.add_spec "spec", [RuntimeError.new]
         assert_match(/spec \(FAILED - 1\)/, @io.string)
       end
 

data/test/spec/runner/specification_test.rb

@@ -12,20 +12,20 @@ module Spec
           self.should.not.be.instance_of Specification
           self.should.be.instance_of ExecutionContext
         end
-        @reporter.should.receive(:add_spec).with "should pass", :anything, []
+        @reporter.should.receive(:add_spec).with "should pass", []
         spec.run @reporter
       end
 
       def test_should_add_itself_to_reporter_when_passes
         spec = Specification.new("spec") {}
-        @reporter.should.receive(:add_spec).with "spec", :anything, []
+        @reporter.should.receive(:add_spec).with "spec", []
         spec.run(@reporter)
       end
 
       def test_should_add_itself_to_reporter_when_fails
         error = RuntimeError.new
         spec = Specification.new("spec") { raise error }
-        @reporter.should.receive(:add_spec).with "spec", :anything, [error]
+        @reporter.should.receive(:add_spec).with "spec", [error]
         spec.run(@reporter)
       end
       
@@ -40,7 +40,7 @@ module Spec
           mock = mock("a mock")
           mock.should.receive(:poke)
         end
-        @reporter.should.receive(:add_spec) do |spec_name, calling_line, errors|
+        @reporter.should.receive(:add_spec) do |spec_name, errors|
           spec_name.should.equal "spec"
           errors[0].message.should.match /expected poke once, but received it 0 times/
         end
@@ -54,7 +54,7 @@ module Spec
         teardown = lambda do
           raise "in teardown"
         end
-        @reporter.should.receive(:add_spec) do |spec, calling_line, errors| 
+        @reporter.should.receive(:add_spec) do |spec, errors| 
           errors.length.should.equal 2
           errors[0].message.should.equal "in body"
           errors[1].message.should.equal "in teardown"

data/test/spec/tool/command_line_test.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 require 'spec/tool/command_line'
-require 'stringio'
 
 module Spec
   module Tool

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'stringio'
 $LOAD_PATH.push File.dirname(__FILE__) + '/../lib'
 $LOAD_PATH.push File.dirname(__FILE__) + '/../test'
 require 'spec'