rspec 0.6.3 → 0.6.4

data/lib/spec/runner/specification.rb

@@ -1,7 +1,7 @@
 module Spec
   module Runner
     class Specification
-    
+
       def initialize(name, &block)
         @name = name
         @block = block
@@ -38,7 +38,7 @@ module Spec
       def add_mock(mock)
         @mocks << mock
       end
-      
+
       def matches_matcher?(matcher)
         matcher.matches? @name 
       end

data/lib/spec/test_to_spec/ruby2ruby.rb

@@ -60,7 +60,6 @@ class Method
 
 end
 
-
 class RubyToRuby < SexpProcessor
 
   def self.translate(klass, method=nil)
@@ -75,6 +74,7 @@ class RubyToRuby < SexpProcessor
 
   def initialize
     super
+    @block_params = false
     @indent = "  "
     self.auto_shift_type = true
     self.strict = true

data/lib/spec/version.rb

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

data/test/spec/expectations/arbitrary_operator_test.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Expectations
+    module Helper
+
+      class ArbitraryOperatorTest < Test::Unit::TestCase
+
+        # == arg
+  
+        def test_should_pass_when_equals_operator_passes
+          assert_nothing_raised do
+            (2+2).should == 4
+          end
+        end
+        
+        def test_should_fail_when_equals_operator_fails
+          assert_raise(ExpectationNotMetError) do
+            (2+2).should == 5
+          end
+        end
+
+        # =~ arg
+  
+        def test_should_pass_when_match_operator_passes
+          assert_nothing_raised do
+            "foo".should =~ /oo/
+          end
+        end
+
+        def test_should_fail_when_match_operator_fails
+          assert_raise(ExpectationNotMetError) do
+            "fu".should =~ /oo/
+          end
+        end
+
+        # < and >
+  
+        def test_should_pass_when_comparison_passes
+          assert_nothing_raised do
+            3.should_be < 4
+          end
+        end
+
+        def test_should_fail_when_comparison_fails
+          assert_raise(ExpectationNotMetError) do
+            3.should_be > 4
+          end
+        end
+
+      end
+      
+    end
+  end
+end

data/test/spec/expectations/arbitrary_predicate_test.rb

@@ -0,0 +1,163 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Expectations
+    module Helper
+
+      class ShouldBeArbitraryPredicateTest < Test::Unit::TestCase
+
+        # should_be_<predicate>
+
+        def test_should_pass_when_predicate_returns_true
+          mock = HandCodedMock.new(true)
+          assert_nothing_raised do
+            mock.should_be_funny
+          end
+          mock.__verify
+        end
+
+        def test_should_fail_when_predicate_returns_false
+          mock = HandCodedMock.new(false)
+          assert_raise(ExpectationNotMetError) do
+            mock.should_be_funny
+          end
+        end
+
+        def test_should_fail_when_predicate_returns_nil
+          mock = HandCodedMock.new(nil)
+          assert_raise(ExpectationNotMetError) do
+            mock.should_be_funny
+          end
+          mock.__verify
+        end
+
+        def test_should_fail_when_method_returns_something_other_than_true_false_or_nil
+          mock = HandCodedMock.new(5)
+          assert_nothing_raised do
+            mock.should_be_funny
+          end
+          mock.__verify
+        end
+
+        def test_should_raise_when_target_does_not_respond_to_predicate
+          assert_raise(NoMethodError) do
+            5.should_be_funny
+          end
+        end
+
+        # should_be_funny(args)
+  
+        def test_should_pass_when_predicate_accepts_args_and_returns_true
+          mock = HandCodedMock.new(true)
+          assert_nothing_raised do
+            mock.should_be_hungry(1, 2, 3)
+          end
+          mock.__verify
+        end
+
+        def test_should_fail_when_predicate_accepts_args_and_returns_false
+          mock = HandCodedMock.new(false)
+          assert_raise(ExpectationNotMetError) do
+            mock.should_be_hungry(1, 2, 3)
+          end
+          mock.__verify
+        end
+
+        # should_exist => exists?
+        
+        def test_should_support_plural_form
+          mock = HandCodedMock.new(true)
+          assert_nothing_raised do
+            mock.should_exist
+          end
+        end
+        
+        def test_should_support_multi_word_predicates_with_should
+          assert_nothing_raised do
+            HandCodedMock.new(true).should_multi_word_predicate
+          end
+        end
+
+        def test_should_support_multi_word_predicates_with_should_be
+          assert_nothing_raised do
+            HandCodedMock.new(true).should_be_multi_word_predicate
+          end
+        end
+
+      end
+      
+      class ShouldNotBeArbitraryPredicateTest < Test::Unit::TestCase
+
+        # should_not_be_funny
+
+        def test_should_pass_when_predicate_returns_false
+          mock = HandCodedMock.new(false)
+          assert_nothing_raised do
+            mock.should_not_be_funny
+          end
+          mock.__verify
+        end
+
+        def test_should_fail_when_predicate_returns_true
+          mock = HandCodedMock.new(true)
+          assert_raise(ExpectationNotMetError) do
+            mock.should_not_be_funny
+          end
+          mock.__verify
+        end
+
+        def test_should_pass_when_predicate_returns_nil
+          mock = HandCodedMock.new(nil)
+          assert_nothing_raised do
+            mock.should_not_be_funny
+          end
+          mock.__verify
+        end
+
+        def test_should_fail_when_method_returns_something_other_than_true_false_or_nil
+          mock = HandCodedMock.new(5)
+          assert_raise(ExpectationNotMetError) do
+            mock.should_not_be_funny
+          end
+          mock.__verify
+        end
+
+        def test_should_raise_when_target_does_not_respond_to_predicate
+          assert_raise(NoMethodError) do
+            5.should_not_be_funny
+          end
+        end
+          
+        # should_be_funny(args)
+  
+        def test_should_fail_when_predicate_accepts_args_and_returns_true
+          mock = HandCodedMock.new(true)
+          assert_raise(ExpectationNotMetError) do
+            mock.should_not_be_hungry(1, 2, 3)
+          end
+          mock.__verify
+        end
+
+        def test_should_pass_when_predicate_accepts_args_and_returns_false
+          mock = HandCodedMock.new(false)
+          assert_nothing_raised do
+            mock.should_not_be_hungry(1, 2, 3)
+          end
+          mock.__verify
+        end
+
+        def test_should_support_multi_word_predicates_with_should
+          assert_nothing_raised do
+            HandCodedMock.new(false).should_not_multi_word_predicate
+          end
+        end
+
+        def test_should_support_multi_word_predicates_with_should_be
+          assert_nothing_raised do
+            HandCodedMock.new(false).should_not_be_multi_word_predicate
+          end
+        end
+      end
+    end
+  end
+end

data/test/spec/{api/helper → expectations}/containment_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ContainmentTest < Test::Unit::TestCase
 

data/test/spec/expectations/diff_test.rb

@@ -0,0 +1,62 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Expectations
+    class DiffTest < Test::Unit::TestCase
+      def test_should_output_unified_diff_of_two_strings
+        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
+end

data/test/spec/{api/helper → expectations}/identity_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldBeTest < Test::Unit::TestCase
 

data/test/spec/{api/helper → expectations}/object_equality_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldEqualTest < Test::Unit::TestCase
 

data/test/spec/{api/helper → expectations}/raising_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldRaiseTest < Test::Unit::TestCase
 
@@ -18,7 +18,7 @@ module Spec
         end
   
         def test_should_fail_when_exact_exception_is_raised_with_wrong_message
-          assert_raises(Spec::Api::ExpectationNotMetError) do
+          assert_raises(Spec::Expectations::ExpectationNotMetError) do
             lambda { raise StandardError.new("chunky bacon") }.should_raise StandardError, "rotten tomatoes"
           end
         end
@@ -55,7 +55,7 @@ module Spec
         end
   
         def test_should_faile_when_exact_exception_is_raised_with_message
-          assert_raises(Spec::Api::ExpectationNotMetError) do
+          assert_raises(Spec::Expectations::ExpectationNotMetError) do
             lambda { raise StandardError.new("abc") }.should_not_raise StandardError, "abc"
           end
         end
@@ -97,7 +97,7 @@ module Spec
         def TODOtest_should_understand_raised_with_message_matching
           lambda do
             raise 'Hello'
-          end.should_raise(StandardError).with.message.matching /ello/
+          end.should_raise(StandardError).with.message.matching(/ello/)
         end
 
       end

data/test/spec/{api/helper → expectations}/regex_matching_test.rb

@@ -1,19 +1,19 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldMatchTest < Test::Unit::TestCase
 
         def test_should_not_raise_when_objects_match
           assert_nothing_raised do
-            "hi aslak".should_match /aslak/
+            "hi aslak".should_match(/aslak/)
           end
         end
 
         def test_should_raise_when_objects_do_not_match
           assert_raise(ExpectationNotMetError) do
-            "hi aslak".should_match /steve/
+            "hi aslak".should_match(/steve/)
           end
         end
       end
@@ -21,13 +21,13 @@ module Spec
       class ShouldNotMatchTest < Test::Unit::TestCase
         def test_should_not_raise_when_objects_do_not_match
           assert_nothing_raised do
-            "hi aslak".should_not_match /steve/
+            "hi aslak".should_not_match(/steve/)
           end
         end
 
         def test_should_raise_when_objects_match
           assert_raise(ExpectationNotMetError) do
-            "hi aslak".should_not_match /aslak/
+            "hi aslak".should_not_match(/aslak/)
           end
         end
       end

data/test/spec/{api/helper → expectations}/should_have_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldHaveTest < Test::Unit::TestCase
         
@@ -56,6 +56,15 @@ module Spec
             @owner.should_have_exactly(3).items_in_collection_with_size_method
           end
         end
+        
+        def test_should_not_raise_when_expecting_actual_size_with_args
+          assert_nothing_raised do
+            @owner.should_have(3).items_for('a')
+            @owner.should_have_exactly(3).items_for('a')
+            @owner.should_have(1).items_for('b')
+            @owner.should_have_exactly(1).items_for('b')
+          end
+        end
       end
       
       class ShouldHaveAtLeastTest < Test::Unit::TestCase