rspec 0.5.3 → 0.5.4

data/test/rcov/rcov_testtask.rb

@@ -17,6 +17,7 @@ module RCov
             end
           @ruby_opts.unshift( "-I#{lib_path}" )
           @ruby_opts.unshift( "--exclude test.*.rb")
+          @ruby_opts.unshift( "--exclude lib.spec.sorted_find.rb")
           @ruby_opts.unshift( "-w" ) if @warning
           rcov @ruby_opts.join(" ") +
             " \"#{run_code}\" " +

data/test/spec/api/duck_type_test.rb

@@ -5,13 +5,13 @@ module Spec
     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? [])
+        duck_type = DuckTypeArgConstraint.new(:length)
+        assert duck_type.matches?([])
       end
 
       def test_should_talk_like_something_with_two_messages_specified
-        duck_type = DuckType.new(:length, :empty?)
-        assert(duck_type.walks_like? [])
+        duck_type = DuckTypeArgConstraint.new(:length, :empty?)
+        assert duck_type.matches?([])
       end
 
     end

data/test/spec/api/helper/raising_test.rb

@@ -3,39 +3,42 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Spec
   module Api
     module Helper
-      class RaisingTest < Test::Unit::TestCase
+      class ShouldRaiseTest < Test::Unit::TestCase
 
-        # should.raise
-  
-        def test_should_raise_should_pass_when_proper_exception_is_raised
+        def test_should_raise_should_pass_when_exact_exception_is_raised
           assert_nothing_raised do
-            proc { ''.nonexistant_method }.should.raise NoMethodError
+            proc { ''.nonexistent_method }.should.raise NoMethodError
           end
         end
   
-        def test_should_raise_should_fail_when_wrong_exception_is_raised
-          assert_raise(ExpectationNotMetError) do
-            proc { ''.nonexistant_method }.should.raise SyntaxError
+        def test_should_raise_should_pass_when_subclass_exception_is_raised
+          assert_nothing_raised do
+            proc { ''.nonexistent_method }.should.raise
           end
         end
   
-        def test_should_raise_should_fail_when_no_exception_is_raised
-          assert_raise(ExpectationNotMetError) do
-            proc {''.to_s}.should.raise NoMethodError
+        def test_should_raise_should_fail_when_wrong_exception_is_raised
+          begin
+            proc { ''.nonexistent_method }.should.raise SyntaxError
+          rescue => e
           end
+          assert_equal("<Proc> should raise <SyntaxError> but raised #<NoMethodError: undefined method `nonexistent_method' for \"\":String>", e.message)
         end
   
-        # should.not.raise
-  
-        def test_should_not_raise_should_fail_when_specific_exception_is_raised
-          assert_raise(ExpectationNotMetError) do
-            proc { ''.nonexistant_method }.should.not.raise NoMethodError
+        def test_should_raise_should_fail_when_no_exception_is_raised
+          begin
+            proc { }.should.raise SyntaxError
+          rescue => e
           end
+          assert_equal("<Proc> should raise <SyntaxError> but raised nothing", e.message)
         end
+      end
+        
+      class ShouldNotRaiseTest < Test::Unit::TestCase
   
         def test_should_not_raise_should_pass_when_other_exception_is_raised
           assert_nothing_raised do
-            proc { ''.nonexistant_method }.should.not.raise SyntaxError
+            proc { ''.nonexistent_method }.should.not.raise SyntaxError
           end
         end
   
@@ -51,11 +54,28 @@ module Spec
           end
         end
         
+        def test_should_not_raise_should_fail_when_specific_exception_is_raised
+          begin
+            proc { ''.nonexistent_method }.should.not.raise NoMethodError
+          rescue => e
+          end
+          assert_equal("<Proc> should not raise <NoMethodError>", e.message)
+        end
+  
+        def test_should_include_actual_error_in_failure_message
+          begin
+            proc { ''.nonexistent_method }.should.not.raise Exception
+          rescue => e
+          end
+          assert_equal("<Proc> should not raise <Exception> but raised #<NoMethodError: undefined method `nonexistent_method' for \"\":String>", e.message)
+        end
+  
         def TODOtest_should_understand_raised_with_message_matching
           lambda do
             raise 'Hello'
           end.should.raise(StandardError).with.message.matching /ello/
         end
+
       end
     end
   end

data/test/spec/api/{mock_arg_constraints_test.rb → mocks/mock_arg_constraints_test.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.dirname(__FILE__) + '/../../../test_helper'
 
 module Spec
   module Api
@@ -44,14 +44,20 @@ module Spec
         @mock.__verify
       end
       
+      def test_should_match_non_special_symbol
+        @mock.should.receive(:random_call).with(:some_symbol)
+        @mock.random_call(:some_symbol)
+        @mock.__verify
+      end
+      
       def test_should_process_duck_type_with_one_method
-        @mock.should.receive(:random_call).with(DuckType.new(:length))
+        @mock.should.receive(:random_call).with(DuckTypeArgConstraint.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.should.receive(:random_call).with(DuckTypeArgConstraint.new(:abs, :div))
         @mock.random_call(1)
         @mock.__verify
       end
@@ -89,7 +95,7 @@ module Spec
       end
       
       def test_should_reject_goose_when_expecting_a_duck
-        @mock.should.receive(:random_call).with(DuckType.new(:abs, :div))
+        @mock.should.receive(:random_call).with(DuckTypeArgConstraint.new(:abs, :div))
         assert_raise(MockExpectationError) do
           @mock.random_call("I don't respond to :abs or :div")
           @mock.__verify

data/test/spec/api/mocks/mock_ordering_test.rb

@@ -0,0 +1,62 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Spec
+  module Api
+
+    class MockTest < Test::Unit::TestCase
+
+      def setup
+        @mock = Mock.new("test mock")
+      end
+
+      def test_two_in_order_calls
+        @mock.should.receive(:one).ordered
+        @mock.should.receive(:two).ordered
+        @mock.one
+        @mock.two
+        @mock.__verify
+      end
+
+      def test_two_out_of_order_calls
+        @mock.should.receive(:one).ordered
+        @mock.should.receive(:two).ordered
+        assert_raise(MockExpectationError) do
+          @mock.two
+        end
+      end
+      
+      def test_three_linear_calls
+        @mock.should.receive(:one).ordered
+        @mock.should.receive(:two).ordered
+        @mock.should.receive(:three).ordered
+        @mock.one
+        @mock.two
+        @mock.three
+        @mock.__verify
+      end
+
+      def test_three_out_of_order_calls
+        @mock.should.receive(:one).ordered
+        @mock.should.receive(:two).ordered
+        @mock.should.receive(:three).ordered
+        @mock.one
+        assert_raise(MockExpectationError) do
+          @mock.three
+        end
+      end
+      
+      def test_two_ordered_calls_with_others_between
+        @mock.should.receive(:zero)
+        @mock.should.receive(:one).ordered
+        @mock.should.receive(:two).ordered
+        @mock.should.receive(:one_and_a_half)
+        @mock.one
+        @mock.one_and_a_half
+        @mock.zero
+        @mock.two
+        @mock.__verify
+      end
+      
+    end
+  end
+end

data/test/spec/api/{mock_test.rb → mocks/mock_test.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../test_helper'
+require File.dirname(__FILE__) + '/../../../test_helper'
 
 module Spec
   module Api
@@ -59,12 +59,6 @@ module Spec
         }
       end
   
-      def test_should_allow_unexpected_methods_if_ignore_missing_set
-        m = Mock.new("null_object", :null_object=>true)
-        m.random_call("a","d","c")
-        m.__verify
-      end 
-  
       # TODO: rename to should_raise_exception_telling_what_message_was_not_received
       def test_should_raise_exception_on_verify_if_call_counts_not_as_expected
         @mock.should.receive(:random_call).twice.with("a","b","c").and.return("booh")
@@ -305,6 +299,35 @@ module Spec
         end
       end
       
+      def test_should_yield_values
+        @mock.should.receive(:yield_back).with(:no_args).once.and.yield('wha', 'zup')
+        a, b = nil
+        @mock.yield_back {|a,b|}
+        a.should.equal 'wha'
+        b.should.equal 'zup'
+        @mock.__verify
+      end
+
+      def test_should_fail_when_calling_yielding_method_with_wrong_arity
+        @mock.should.receive(:yield_back).with(:no_args).once.and.yield('wha', 'zup')
+        assert_raise(MockExpectationError) do
+          @mock.yield_back {|a|}
+        end
+      end
+
+      def test_should_fail_when_calling_yielding_method_without_block
+        @mock.should.receive(:yield_back).with(:no_args).once.and.yield('wha', 'zup')
+        assert_raise(MockExpectationError) do
+          @mock.yield_back
+        end
+      end
+      
+      def test_should_be_able_to_mock_object_methods_such_as_send
+        @mock.should.receive(:send).with(:any_args)
+        @mock.send 'hi'
+        @mock.__verify
+      end
+      
     end
   end
 end

data/test/spec/api/mocks/null_object_test.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Spec
+  module Api
+
+    class NullObjectTest < Test::Unit::TestCase
+
+      def setup
+        @mock = Mock.new("null_object", :null_object=>true)
+      end
+       
+      def test_should_ignore_unexpected_methods
+        @mock.random_call("a","d","c")
+        @mock.__verify
+      end 
+    
+      def test_should_handle_passing_expectation
+        @mock.should_receive(:something)
+        @mock.something
+        @mock.__verify
+      end
+      
+      def test_should_handle_failing_expectation
+        assert_raises(MockExpectationError) do
+          @mock.should_receive(:something)
+          @mock.__verify
+        end
+      end
+    end
+  end
+end

data/test/spec/api/sugar_test.rb

@@ -0,0 +1,71 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Api
+    class SugarTest < Test::Unit::TestCase
+      
+      def test_should_allow_underscored_shoulds_on_regular_objects
+        1.should_equal 1
+        lambda { 1.should_not_equal 1 }.should_raise
+      end
+      
+      def test_should_allow_underscored_shoulds_on_mocks
+        sweetener = Mock.new "sweetener"
+        sweetener.should_receive(:natural?)
+        sweetener.natural?
+        sweetener.__verify
+      end
+      
+      def test_should_allow_underscored_ats_on_mocks
+        sweetener = Mock.new "sweetener"
+        sweetener.should_receive(:natural?).at_least(:once)
+        sweetener.natural?
+        sweetener.__verify
+      end
+      
+      def test_should_allow_underscored_ands_on_mocks
+        sweetener = Mock.new "sweetener"
+        sweetener.should_receive(:natural?).at_least(:once).and_return(true)
+        natural = sweetener.natural?
+        natural.should_be true
+        sweetener.__verify
+      end
+      
+      def test_should_allow_underscored_anys_on_mocks
+        sweetener = Mock.new "sweetener"
+        sweetener.should_receive(:natural?).any_number_of_times
+        sweetener.natural?
+        sweetener.__verify
+      end
+
+      def test_should_allow_underscored_anys_on_mocks
+        sweetener = Mock.new "sweetener"
+        sweetener.should_receive(:natural?).once_and_return(false)
+        natural = sweetener.natural?
+        natural.should_be false
+        sweetener.__verify
+      end
+      
+      def test_should_allow_multi_word_predicates_in_passing_specs
+        subject = ClassWithMultiWordPredicate.new
+        assert_nothing_raised do
+          subject.should_be_multi_word_predicate
+        end
+      end
+      
+      def test_should_allow_multi_word_predicates_in_failing_specs
+        subject = ClassWithMultiWordPredicate.new
+        assert_raises(ExpectationNotMetError) do
+          subject.should_not_be_multi_word_predicate
+        end
+      end
+
+    end
+    
+    class ClassWithMultiWordPredicate
+      def multi_word_predicate?
+        true 
+      end
+    end
+  end
+end

data/test/spec/runner/backtrace_tweaker_test.rb

@@ -4,25 +4,73 @@ module Spec
     class BacktraceTweakerTest < Test::Unit::TestCase
       def setup
         @error = RuntimeError.new
-        @tweaker = BacktraceTweaker.new
+        @tweaker = NoisyBacktraceTweaker.new
       end
       
       def test_should_not_barf_on_nil_backtrace
         proc { @tweaker.tweak_backtrace @error, 'spec name' }.should.not.raise
       end
       
-      def test_should_remove___instance_exec
+      def test_should_replace___instance_exec_with_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_leave_anything_in_api_dir_in_full_backtrace_mode
+        @error.set_backtrace ["/lib/spec/api/anything.rb"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace[0].should.equal "/lib/spec/api/anything.rb"
+      end
+
+      def test_should_leave_anything_in_runner_dir_in_full_backtrace_mode
+        @error.set_backtrace ["/lib/spec/runner/anything.rb"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace.should.not.be.empty
+      end
+      
+      def test_should_leave_bin_spec
+        @error.set_backtrace ["bin/spec:"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace.should.not.be.empty
+      end
       
-      def test_should_remove_helpers
+    end
+
+    class QuietBacktraceTweakerTest < Test::Unit::TestCase
+      def setup
         @error = RuntimeError.new
-        @error.set_backtrace ["/lib/spec/api/helper/any_helper.rb"]
+        @tweaker = QuietBacktraceTweaker.new
+      end
+      
+      def test_should_not_barf_on_nil_backtrace
+        proc { @tweaker.tweak_backtrace @error, 'spec name' }.should.not.raise
+      end
+      
+      def test_should_replace___instance_exec_with_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_anything_in_api_dir
+        @error.set_backtrace ["/lib/spec/api/anything.rb"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace.should.be.empty
+      end
+
+      def test_should_remove_anything_in_runner_dir
+        @error.set_backtrace ["/lib/spec/runner/anything.rb"]
+        @tweaker.tweak_backtrace @error, 'spec name'
+        @error.backtrace.should.be.empty
+      end
+
+      def test_should_remove_bin_spec
+        @error.set_backtrace ["bin/spec:"]
         @tweaker.tweak_backtrace @error, 'spec name'
         @error.backtrace.should.be.empty
       end
+
     end
   end
 end