rspec 0.5.11 → 0.5.12

data/lib/spec/version.rb

@@ -3,7 +3,7 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 5
-      TINY   = 11
+      TINY   = 12
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG    = "REL_" + [MAJOR, MINOR, TINY].join('_')

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

@@ -3,131 +3,107 @@ require File.dirname(__FILE__) + '/../../../test_helper'
 module Spec
   module Api
     module Helper
-    
-      class XxxMock
-        def initialize(return_val)
-          @return_val = return_val
-          @xxx_called = false
-        end
-        
-        def xxx?
-          @xxx_called = true
-          @return_val
-        end
-        
-        def yyy?(a, b, c)
-          a.should.be 1
-          b.should.be 2
-          c.should.be 3
-          @xxx_called = true
-          @return_val
-        end
-        
-        def __verify
-          @xxx_called.should.be true
-        end
-      end
-    
+
       class ArbitraryPredicateTest < Test::Unit::TestCase
 
         # should.be.xxx
 
-      	def test_should_be_xxx_should_raise_when_target_doesnt_understand_xxx
-      		assert_raise(NoMethodError) do
+        def test_should_be_xxx_should_raise_when_target_doesnt_understand_xxx
+          assert_raise(NoMethodError) do
             5.should.be.xxx
           end
-      	end
+        end
 
-      	def test_should_be_xxx_should_raise_when_sending_xxx_to_target_returns_false
-      		mock = XxxMock.new(false)
-      		assert_raise(ExpectationNotMetError) do
+        def test_should_be_xxx_should_raise_when_sending_xxx_to_target_returns_false
+          mock = XxxMock.new(false)
+          assert_raise(ExpectationNotMetError) do
             mock.should.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
 
-      	def test_should_be_xxx_should_raise_when_sending_xxx_to_target_returns_nil
-      		mock = XxxMock.new(nil)
-      		assert_raise(ExpectationNotMetError) do
+        def test_should_be_xxx_should_raise_when_sending_xxx_to_target_returns_nil
+          mock = XxxMock.new(nil)
+          assert_raise(ExpectationNotMetError) do
             mock.should.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
 
-      	def test_should_be_xxx_should_not_raise_when_sending_xxx_to_target_returns_true
-      		mock = XxxMock.new(true)
-      	  assert_nothing_raised do
+        def test_should_be_xxx_should_not_raise_when_sending_xxx_to_target_returns_true
+          mock = XxxMock.new(true)
+          assert_nothing_raised do
             mock.should.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
 
-      	def test_should_be_xxx_should_not_raise_when_sending_xxx_to_target_returns_something_other_than_true_false_or_nil
-      		mock = XxxMock.new(5)
-      	  assert_nothing_raised do
+        def test_should_be_xxx_should_not_raise_when_sending_xxx_to_target_returns_something_other_than_true_false_or_nil
+          mock = XxxMock.new(5)
+          assert_nothing_raised do
             mock.should.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
 
-      	# should.be.xxx(args)
-	
+        # should.be.xxx(args)
+  
         def test_should_be_xxx_with_args_passes_args_properly
-       		mock = XxxMock.new(true)
-      	  assert_nothing_raised do
+           mock = XxxMock.new(true)
+          assert_nothing_raised do
             mock.should.be.yyy(1, 2, 3)
           end
-      		mock.__verify
+          mock.__verify
         end
 
         # should.not.be.xxx
 
-      	def test_should_not_be_xxx_should_raise_when_target_doesnt_understand_xxx
-      		assert_raise(NoMethodError) do
+        def test_should_not_be_xxx_should_raise_when_target_doesnt_understand_xxx
+          assert_raise(NoMethodError) do
             5.should.not.be.xxx
           end
-      	end
+        end
 
-      	def test_should_not_be_xxx_should_raise_when_sending_xxx_to_target_returns_true
-      		mock = XxxMock.new(true)
-      	  assert_raise(ExpectationNotMetError) do
+        def test_should_not_be_xxx_should_raise_when_sending_xxx_to_target_returns_true
+          mock = XxxMock.new(true)
+          assert_raise(ExpectationNotMetError) do
             mock.should.not.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
 
-      	def test_should_not_be_xxx_shouldnt_raise_when_sending_xxx_to_target_returns_nil
-      		mock = XxxMock.new(nil)
-      	  assert_nothing_raised do
+        def test_should_not_be_xxx_shouldnt_raise_when_sending_xxx_to_target_returns_nil
+          mock = XxxMock.new(nil)
+          assert_nothing_raised do
             mock.should.not.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
 
-      	def test_should_not_be_xxx_shouldnt_raise_when_sending_xxx_to_target_returns_false
-      		mock = XxxMock.new(false)
-      	  assert_nothing_raised do
+        def test_should_not_be_xxx_shouldnt_raise_when_sending_xxx_to_target_returns_false
+          mock = XxxMock.new(false)
+          assert_nothing_raised do
             mock.should.not.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
 
-      	def test_should_not_be_xxx_should_raise_when_sending_xxx_to_target_returns_something_other_than_true_false_or_nil
-      		mock = XxxMock.new(5)
-      	  assert_raise(ExpectationNotMetError) do
+        def test_should_not_be_xxx_should_raise_when_sending_xxx_to_target_returns_something_other_than_true_false_or_nil
+          mock = XxxMock.new(5)
+          assert_raise(ExpectationNotMetError) do
             mock.should.not.be.xxx
           end
-      		mock.__verify
+          mock.__verify
         end
   
-      	# should.be.xxx(args)
-	
+        # should.be.xxx(args)
+  
         def test_should_not_be_xxx_with_args_passes_args_properly
-       		mock = XxxMock.new(false)
-      	  assert_nothing_raised do
+           mock = XxxMock.new(false)
+          assert_nothing_raised do
             mock.should.not.be.yyy(1, 2, 3)
           end
-      		mock.__verify
+          mock.__verify
         end
 
       end

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

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/../../../test_helper'
+
+module Spec
+  class DiffTest < Test::Unit::TestCase
+    def test_should_output_unified_diff
+      expected = <<-EOF
+foo
+bar
+zap
+this
+is
+soo
+very
+very
+equal
+insert
+a
+line
+EOF
+
+      actual = <<-EOF
+foo
+zap
+bar
+this
+is
+soo
+very
+very
+equal
+insert
+a
+another
+line
+EOF
+
+      expected_diff = <<-EOF
+
+
+@@ -1,6 +1,6 @@
+ foo
+-bar
+ zap
++bar
+ this
+ is
+ soo
+@@ -9,5 +9,6 @@
+ equal
+ insert
+ a
++another
+ line
+EOF
+
+      diff = ShouldBase.new.diff_as_string(expected, actual)
+      assert_equal expected_diff, diff
+    end
+  end
+end

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

@@ -25,6 +25,14 @@ module Spec
             @dummy.should.equal @another_dummy
           end
         end
+        
+        def test_should_raise_nice_message
+          begin
+            "foo\nbar\nzap".should_equal "foo\nzap\nbar"
+          rescue ExpectationNotMetError => e
+            assert_equal "\"foo\\nbar\\nzap\" should equal \"foo\\nzap\\nbar\"", e.message
+          end
+        end
 
         # should.not.equal
 
@@ -53,8 +61,14 @@ module Spec
         def test_should_be_close_failing_cases
           assert_raise(ExpectationNotMetError) do
             3.5.should.be.close 3.0, 0.5
+          end
+          assert_raise(ExpectationNotMetError) do
             3.5.should.be.close 2.0, 0.5
+          end
+          assert_raise(ExpectationNotMetError) do
             3.5.should.be.close 4.0, 0.5
+          end
+          assert_raise(ExpectationNotMetError) do
             3.5.should.be.close 5.0, 0.5
           end
         end

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

@@ -149,35 +149,6 @@ module Spec
         
       end
       
-      class CollectionWithSizeMethod
-        def initialize; @list = []; end
-        def size; @list.size; end
-        def push(item); @list.push(item); end
-      end
-
-      class CollectionWithLengthMethod
-        def initialize; @list = []; end
-        def length; @list.size; end
-        def push(item); @list.push(item); end
-      end
-
-      class CollectionOwner
-        attr_reader :items_in_collection_with_size_method, :items_in_collection_with_length_method
-
-        def initialize
-          @items_in_collection_with_size_method = CollectionWithSizeMethod.new
-          @items_in_collection_with_length_method = CollectionWithLengthMethod.new
-        end
-
-        def add_to_collection_with_size_method(item)
-          @items_in_collection_with_size_method.push(item)
-        end
-
-        def add_to_collection_with_length_method(item)
-          @items_in_collection_with_length_method.push(item)
-        end
-      end
-      
     end
   end
 end

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

@@ -5,101 +5,101 @@ module Spec
     module Helper
       class TypeTest < Test::Unit::TestCase
 
-      	# should.be.an.instance.of <class>
-	
-      	def test_should_be_an_instance_of_should_pass_when_target_is_specified_class
-      		assert_nothing_raised do
-      			5.should.be.an.instance.of Fixnum
-      		end
-      	end
-	
-      	def test_should_be_an_instance_of_should_fail_when_target_is_not_specified_class
-      		assert_raise(ExpectationNotMetError) do
-      			5.should.be.an.instance.of Integer
-      		end
-      	end
-	
-      	# should.be.a.kind.of <class>
-	
-      	def test_should_be_a_kind_of_should_pass_when_target_is_of_specified_class
-      		assert_nothing_raised do
-      			5.should.be.a.kind.of Fixnum
-      		end
-      	end
+        # should.be.an.instance.of <class>
+  
+        def test_should_be_an_instance_of_should_pass_when_target_is_specified_class
+          assert_nothing_raised do
+            5.should.be.an.instance.of Fixnum
+          end
+        end
+  
+        def test_should_be_an_instance_of_should_fail_when_target_is_not_specified_class
+          assert_raise(ExpectationNotMetError) do
+            5.should.be.an.instance.of Integer
+          end
+        end
+  
+        # should.be.a.kind.of <class>
+  
+        def test_should_be_a_kind_of_should_pass_when_target_is_of_specified_class
+          assert_nothing_raised do
+            5.should.be.a.kind.of Fixnum
+          end
+        end
 
-      	def test_should_be_a_kind_of_should_pass_when_target_is_of_subclass_of_specified_class
-      		assert_nothing_raised do
-      			5.should.be.a.kind.of Integer
-      		end
-      	end
+        def test_should_be_a_kind_of_should_pass_when_target_is_of_subclass_of_specified_class
+          assert_nothing_raised do
+            5.should.be.a.kind.of Integer
+          end
+        end
 
-      	def test_should_be_an_instance_of_should_fail_when_target_is_not_specified_class
-      		assert_raise(ExpectationNotMetError) do
-      			5.should.be.a.kind.of String
-      		end
-      	end
-	
-      	# should.not.be.an.instance_of <class>
-	
-      	def test_should_not_be_an_instance_of_should_fail_when_target_is_of_specified_class
-      		assert_raise(ExpectationNotMetError) do
-      			'hello'.should.not.be.an.instance.of String
-      		end
-      	end
-	
-      	def test_should_be_an_instance_of_should_pass_when_target_is_not_of_specified_class
-      		assert_nothing_raised do
-      			[].should.not.be.an.instance.of String
-      		end
-      	end
+        def test_should_be_an_instance_of_should_fail_when_target_is_not_specified_class
+          assert_raise(ExpectationNotMetError) do
+            5.should.be.a.kind.of String
+          end
+        end
+  
+        # should.not.be.an.instance_of <class>
+  
+        def test_should_not_be_an_instance_of_should_fail_when_target_is_of_specified_class
+          assert_raise(ExpectationNotMetError) do
+            'hello'.should.not.be.an.instance.of String
+          end
+        end
+  
+        def test_should_be_an_instance_of_should_pass_when_target_is_not_of_specified_class
+          assert_nothing_raised do
+            [].should.not.be.an.instance.of String
+          end
+        end
 
-      	# should.be.a.kind.of <class>
-	
-      	def test_should_not_be_a_kind_of_should_fail_when_target_is_of_specified_class
-      		assert_raise(ExpectationNotMetError) do
-      			5.should.not.be.a.kind.of Fixnum
-      		end
-      	end
+        # should.be.a.kind.of <class>
+  
+        def test_should_not_be_a_kind_of_should_fail_when_target_is_of_specified_class
+          assert_raise(ExpectationNotMetError) do
+            5.should.not.be.a.kind.of Fixnum
+          end
+        end
 
-      	def test_should_not_be_a_kind_of_should_fail_when_target_is_of_subclass_of_specified_class
-      		assert_raise(ExpectationNotMetError) do
-      			5.should.not.be.a.kind.of Integer
-      		end
-      	end
+        def test_should_not_be_a_kind_of_should_fail_when_target_is_of_subclass_of_specified_class
+          assert_raise(ExpectationNotMetError) do
+            5.should.not.be.a.kind.of Integer
+          end
+        end
 
-      	def test_should_not_be_an_instance_of_should_pass_when_target_is_not_specified_class
-      		assert_nothing_raised do
-      			5.should.not.be.a.kind.of String
-      		end
-      	end
-	
-      	# should.respond.to <message>
-	
-      	def test_should_respond_to_should_pass_when_target_does
-      		assert_nothing_raised do
-      			"".should.respond.to :length
-      		end
-      	end
+        def test_should_not_be_an_instance_of_should_pass_when_target_is_not_specified_class
+          assert_nothing_raised do
+            5.should.not.be.a.kind.of String
+          end
+        end
+  
+        # should.respond.to <message>
+  
+        def test_should_respond_to_should_pass_when_target_does
+          assert_nothing_raised do
+            "".should.respond.to :length
+          end
+        end
 
-      	def test_should_respond_to_should_fail_when_target_doesnt
-      		assert_raise(ExpectationNotMetError) do
-      			"".should.respond.to :connect
-      		end
-      	end
+        def test_should_respond_to_should_fail_when_target_doesnt
+          assert_raise(ExpectationNotMetError) do
+            "".should.respond.to :connect
+          end
+        end
 
-      	# should.not.respond.to <message>
-	
-      	def test_not_should_respond_to_should_fail_when_target_does
-      		assert_raise(ExpectationNotMetError) do
-      			"".should.not.respond.to :length
-      		end
-      	end
+        # should.not.respond.to <message>
+  
+        def test_not_should_respond_to_should_fail_when_target_does
+          assert_raise(ExpectationNotMetError) do
+            "".should.not.respond.to :length
+          end
+        end
 
-      	def test_not_should_respond_to_should_pass_when_target_doesnt
-      		assert_nothing_raised do
-      			"".should.not.respond.to :connect
-      		end
-      	end
+        def test_not_should_respond_to_should_pass_when_target_doesnt
+          assert_nothing_raised do
+            "".should.not.respond.to :connect
+          end
+        end
 
       end
     end