mocha-macruby 0.9.8.20100129120100 → 0.9.9.20101102121900

data/lib/mocha/module_method.rb

@@ -1,4 +1,4 @@
-require 'mocha/module_method'
+require 'mocha/class_method'
 
 module Mocha
 

data/lib/mocha/object.rb

@@ -5,183 +5,167 @@ require 'mocha/module_method'
 require 'mocha/any_instance_method'
 require 'mocha/argument_iterator'
 
-module Mocha
-  
-  # Methods added all objects to allow mocking and stubbing on real objects.
+# Methods added all objects to allow mocking and stubbing on real objects.
+#
+# Methods return a Mocha::Expectation which can be further modified by methods on Mocha::Expectation.
+class Object
+
+  def mocha # :nodoc:
+    @mocha ||= Mocha::Mockery.instance.mock_impersonating(self)
+  end
+
+  def reset_mocha # :nodoc:
+    @mocha = nil
+  end
+
+  def stubba_method # :nodoc:
+    Mocha::InstanceMethod
+  end
+
+  def stubba_object # :nodoc:
+    self
+  end
+
+  # :call-seq: expects(method_name) -> expectation
+  #            expects(method_names_vs_return_values) -> last expectation
   #
-  # Methods return a Mocha::Expectation which can be further modified by methods on Mocha::Expectation.
-  module ObjectMethods
-  
-    def mocha # :nodoc:
-      @mocha ||= Mocha::Mockery.instance.mock_impersonating(self)
+  # Adds an expectation that a method identified by +method_name+ Symbol must be called exactly once with any parameters.
+  # Returns the new expectation which can be further modified by methods on Mocha::Expectation.
+  #   product = Product.new
+  #   product.expects(:save).returns(true)
+  #   assert_equal true, product.save
+  #
+  # The original implementation of <tt>Product#save</tt> is replaced temporarily.
+  #
+  # The original implementation of <tt>Product#save</tt> is restored at the end of the test.
+  #
+  # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
+  #   product = Product.new
+  #   product.expects(:valid? => true, :save => true)
+  #
+  #   # exactly equivalent to
+  #
+  #   product = Product.new
+  #   product.expects(:valid?).returns(true)
+  #   product.expects(:save).returns(true)
+  def expects(method_name_or_hash)
+    expectation = nil
+    mockery = Mocha::Mockery.instance
+    iterator = Mocha::ArgumentIterator.new(method_name_or_hash)
+    iterator.each { |*args|
+      method_name = args.shift
+      mockery.on_stubbing(self, method_name)
+      method = stubba_method.new(stubba_object, method_name)
+      mockery.stubba.stub(method)
+      expectation = mocha.expects(method_name, caller)
+      expectation.returns(args.shift) if args.length > 0
+    }
+    expectation
+  end
+
+  # :call-seq: stubs(method_name) -> expectation
+  #            stubs(method_names_vs_return_values) -> last expectation
+  #
+  # Adds an expectation that a method identified by +method_name+ Symbol may be called any number of times with any parameters.
+  # Returns the new expectation which can be further modified by methods on Mocha::Expectation.
+  #   product = Product.new
+  #   product.stubs(:save).returns(true)
+  #   assert_equal true, product.save
+  #
+  # The original implementation of <tt>Product#save</tt> is replaced temporarily.
+  #
+  # The original implementation of <tt>Product#save</tt> is restored at the end of the test.
+  #
+  # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
+  #   product = Product.new
+  #   product.stubs(:valid? => true, :save => true)
+  #
+  #   # exactly equivalent to
+  #
+  #   product = Product.new
+  #   product.stubs(:valid?).returns(true)
+  #   product.stubs(:save).returns(true)
+  def stubs(method_name_or_hash)
+    expectation = nil
+    mockery = Mocha::Mockery.instance
+    iterator = Mocha::ArgumentIterator.new(method_name_or_hash)
+    iterator.each { |*args|
+      method_name = args.shift
+      mockery.on_stubbing(self, method_name)
+      method = stubba_method.new(stubba_object, method_name)
+      mockery.stubba.stub(method)
+      expectation = mocha.stubs(method_name, caller)
+      expectation.returns(args.shift) if args.length > 0
+    }
+    expectation
+  end
+
+  def method_exists?(method, include_public_methods = true) # :nodoc:
+    if include_public_methods
+      return true if public_methods(include_superclass_methods = true).include?(method)
+      return true if respond_to?(method.to_sym)
     end
+    return true if protected_methods(include_superclass_methods = true).include?(method)
+    return true if private_methods(include_superclass_methods = true).include?(method)
+    return false
+  end
+
+end
+
+class Module # :nodoc:
   
-    def reset_mocha # :nodoc:
-      @mocha = nil
-    end
+  def stubba_method
+    Mocha::ModuleMethod
+  end
   
-    def stubba_method # :nodoc:
-      Mocha::InstanceMethod
-    end
+end
+
+# Methods added all classes to allow mocking and stubbing on real objects.
+class Class
+  
+  def stubba_method # :nodoc:
+    Mocha::ClassMethod
+  end
+
+  class AnyInstance # :nodoc:
   
-    def stubba_object # :nodoc:
-      self
+    def initialize(klass)
+      @stubba_object = klass
     end
   
-    # :call-seq: expects(method_name) -> expectation
-    #            expects(method_names_vs_return_values) -> last expectation
-    #
-    # Adds an expectation that a method identified by +method_name+ Symbol must be called exactly once with any parameters.
-    # Returns the new expectation which can be further modified by methods on Mocha::Expectation.
-    #   product = Product.new
-    #   product.expects(:save).returns(true)
-    #   assert_equal true, product.save
-    #
-    # The original implementation of <tt>Product#save</tt> is replaced temporarily.
-    #
-    # The original implementation of <tt>Product#save</tt> is restored at the end of the test.
-    #
-    # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
-    #   product = Product.new
-    #   product.expects(:valid? => true, :save => true)
-    #
-    #   # exactly equivalent to
-    #
-    #   product = Product.new
-    #   product.expects(:valid?).returns(true)
-    #   product.expects(:save).returns(true)
-    def expects(method_name_or_hash)
-      expectation = nil
-      mockery = Mocha::Mockery.instance
-      iterator = ArgumentIterator.new(method_name_or_hash)
-      iterator.each { |*args|
-        method_name = args.shift
-        mockery.on_stubbing(self, method_name)
-        method = stubba_method.new(stubba_object, method_name)
-        mockery.stubba.stub(method)
-        expectation = mocha.expects(method_name, caller)
-        expectation.returns(args.shift) if args.length > 0
-      }
-      expectation
+    def mocha
+      @mocha ||= Mocha::Mockery.instance.mock_impersonating_any_instance_of(@stubba_object)
+    end
+
+    def stubba_method
+      Mocha::AnyInstanceMethod
     end
   
-    # :call-seq: stubs(method_name) -> expectation
-    #            stubs(method_names_vs_return_values) -> last expectation
-    #
-    # Adds an expectation that a method identified by +method_name+ Symbol may be called any number of times with any parameters.
-    # Returns the new expectation which can be further modified by methods on Mocha::Expectation.
-    #   product = Product.new
-    #   product.stubs(:save).returns(true)
-    #   assert_equal true, product.save
-    #
-    # The original implementation of <tt>Product#save</tt> is replaced temporarily.
-    #
-    # The original implementation of <tt>Product#save</tt> is restored at the end of the test.
-    #
-    # If +method_names_vs_return_values+ is a +Hash+, an expectation will be set up for each entry using the key as +method_name+ and value as +return_value+.
-    #   product = Product.new
-    #   product.stubs(:valid? => true, :save => true)
-    #
-    #   # exactly equivalent to
-    #
-    #   product = Product.new
-    #   product.stubs(:valid?).returns(true)
-    #   product.stubs(:save).returns(true)
-    def stubs(method_name_or_hash)
-      expectation = nil
-      mockery = Mocha::Mockery.instance
-      iterator = ArgumentIterator.new(method_name_or_hash)
-      iterator.each { |*args|
-        method_name = args.shift
-        mockery.on_stubbing(self, method_name)
-        method = stubba_method.new(stubba_object, method_name)
-        mockery.stubba.stub(method)
-        expectation = mocha.stubs(method_name, caller)
-        expectation.returns(args.shift) if args.length > 0
-      }
-      expectation
+    def stubba_object
+      @stubba_object
     end
   
-    def method_exists?(method, include_public_methods = true) # :nodoc:
+    def method_exists?(method, include_public_methods = true)
       if include_public_methods
-        return true if public_methods(include_superclass_methods = true).include?(method)
-        return true if respond_to?(method.to_sym)
+        return true if @stubba_object.public_instance_methods(include_superclass_methods = true).include?(method)
       end
-      return true if protected_methods(include_superclass_methods = true).include?(method)
-      return true if private_methods(include_superclass_methods = true).include?(method)
+      return true if @stubba_object.protected_instance_methods(include_superclass_methods = true).include?(method)
+      return true if @stubba_object.private_instance_methods(include_superclass_methods = true).include?(method)
       return false
     end
   
   end
-  
-  module ModuleMethods # :nodoc:
-    
-    def stubba_method
-      Mocha::ModuleMethod
-    end
-    
-  end
-  
-  # Methods added all classes to allow mocking and stubbing on real objects.
-  module ClassMethods
-    
-    def stubba_method # :nodoc:
-      Mocha::ClassMethod
-    end
-
-    class AnyInstance # :nodoc:
-    
-      def initialize(klass)
-        @stubba_object = klass
-      end
-    
-      def mocha
-        @mocha ||= Mocha::Mockery.instance.mock_impersonating_any_instance_of(@stubba_object)
-      end
 
-      def stubba_method
-        Mocha::AnyInstanceMethod
-      end
-    
-      def stubba_object
-        @stubba_object
-      end
-    
-      def method_exists?(method, include_public_methods = true)
-        if include_public_methods
-          return true if @stubba_object.public_instance_methods(include_superclass_methods = true).include?(method)
-        end
-        return true if @stubba_object.protected_instance_methods(include_superclass_methods = true).include?(method)
-        return true if @stubba_object.private_instance_methods(include_superclass_methods = true).include?(method)
-        return false
-      end
-    
-    end
-  
-    # :call-seq: any_instance -> mock object
-    #
-    # Returns a mock object which will detect calls to any instance of this class.
-    #   Product.any_instance.stubs(:save).returns(false)
-    #   product_1 = Product.new
-    #   assert_equal false, product_1.save
-    #   product_2 = Product.new
-    #   assert_equal false, product_2.save
-    def any_instance
-      @any_instance ||= AnyInstance.new(self)
-    end
-  
+  # :call-seq: any_instance -> mock object
+  #
+  # Returns a mock object which will detect calls to any instance of this class.
+  #   Product.any_instance.stubs(:save).returns(false)
+  #   product_1 = Product.new
+  #   assert_equal false, product_1.save
+  #   product_2 = Product.new
+  #   assert_equal false, product_2.save
+  def any_instance
+    @any_instance ||= AnyInstance.new(self)
   end
-  
-end
-
-class Object # :nodoc:
-  include Mocha::ObjectMethods
-end
 
-class Module # :nodoc:
-  include Mocha::ModuleMethods
-end
-
-class Class # :nodoc:
-  include Mocha::ClassMethods
-end
+end

data/lib/mocha/options.rb

@@ -0,0 +1 @@
+$options = (ENV['MOCHA_OPTIONS'] || '').split(',').inject({}) { |hash, key| hash[key] = true; hash }

data/lib/mocha/parameter_matchers/base.rb

@@ -2,12 +2,60 @@ module Mocha
   
   module ParameterMatchers
     
-    class Base # :nodoc:
+    class Base 
       
-      def to_matcher
+      def to_matcher # :nodoc:
         self
       end
       
+      # :call-seq: &(matcher) -> parameter_matcher
+      #
+      # A short hand way of specifying multiple matchers that should
+      # all match.
+      #
+      # Returns a new +AllOf+ parameter matcher combining the
+      # given matcher and the receiver.
+      #
+      # The following statements are equivalent:
+      #   object = mock()
+      #   object.expects(:run).with(all_of(has_key(:foo), has_key(:bar)))
+      #   object.run(:foo => 'foovalue', :bar => 'barvalue')
+      #
+      #   # with the shorthand
+      #   object.expects(:run).with(has_key(:foo) & has_key(:bar))
+      #   object.run(:foo => 'foovalue', :bar => 'barvalue)
+      def &(matcher)
+        AllOf.new(self, matcher)
+      end
+      
+      # :call-seq: |(matcher) -> parameter_matcher
+      #
+      # A short hand way of specifying multiple matchers, only at least
+      # one of which should pass.
+      #
+      # Returns a new +AnyOf+ parameter matcher combining the
+      # given matcher and the receiver.
+      #
+      # The following statements are equivalent:
+      #   object = mock()
+      #   object.expects(:run).with(any_of(has_key(:foo), has_key(:bar)))
+      #   object.run(:foo => 'foovalue')
+      #
+      #   # with the shorthand
+      #   object.expects(:run).with(has_key(:foo) | has_key(:bar))
+      #   object.run(:foo => 'foovalue')
+      #
+      # This shorthand will not work with an implicit equals match. Instead,
+      # an explicit equals matcher should be used:
+      #
+      #   object.expects(:run).with(equals(1) | equals(2))
+      #   object.run(1) # passes
+      #   object.run(2) # passes
+      #   object.run(3) # fails
+      def |(matcher)
+        AnyOf.new(self, matcher)
+      end
+      
     end
     
   end

data/test/acceptance/acceptance_test_helper.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "test_helper")
+require File.expand_path('../../test_helper', __FILE__)
 require 'test_runner'
 require 'mocha/configuration'
 

data/test/acceptance/api_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha_standalone'
 require 'simple_counter'
 

data/test/acceptance/bug_18914_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class Bug18914Test < Test::Unit::TestCase

data/test/acceptance/bug_21465_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class Bug21465Test < Test::Unit::TestCase

data/test/acceptance/bug_21563_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class Bug21563Test < Test::Unit::TestCase

data/test/acceptance/expected_invocation_count_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class ExpectedInvocationCountTest < Test::Unit::TestCase

data/test/acceptance/failure_messages_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "acceptance_test_helper")
+require File.expand_path('../acceptance_test_helper', __FILE__)
 require 'mocha'
 
 class FailureMessagesTest < Test::Unit::TestCase