mocha 0.9.12 → 0.10.0

data/lib/mocha/instance_method.rb

@@ -4,6 +4,14 @@ module Mocha
 
   class InstanceMethod < ClassMethod
 
+    def hide_original_method
+      super if singleton_method?(method)
+    end
+
+    def restore_original_method
+      super if singleton_method?(hidden_method)
+    end
+
     def method_exists?(method)
       return true if stubbee.public_methods(false).include?(method)
       return true if stubbee.protected_methods(false).include?(method)
@@ -11,6 +19,14 @@ module Mocha
       return false
     end
 
+    def singleton_method?(method)
+      __metaclass__ = stubbee.__metaclass__
+      return true if __metaclass__.public_instance_methods(false).include?(method)
+      return true if __metaclass__.protected_instance_methods(false).include?(method)
+      return true if __metaclass__.private_instance_methods(false).include?(method)
+      return false
+    end
+
   end
-  
+
 end

data/lib/mocha/integration/mini_test.rb

@@ -1,32 +1,34 @@
 require 'mocha/api'
+require 'mocha/options'
 
 if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
-  
+
   require 'mocha/integration/mini_test/exception_translation'
   require 'mocha/integration/mini_test/version_13'
   require 'mocha/integration/mini_test/version_140'
   require 'mocha/integration/mini_test/version_141'
   require 'mocha/integration/mini_test/version_142_to_172'
   require 'mocha/integration/mini_test/version_200'
-  require 'mocha/integration/mini_test/version_201_to_202'
-  
+  require 'mocha/integration/mini_test/version_201_to_222'
+  require 'mocha/integration/mini_test/version_230_to_251'
+
   module MiniTest
     class Unit
       class TestCase
-        
+
         include Mocha::API
-        
+
         alias_method :run_before_mocha, :run
         remove_method :run
-        
+
         mini_test_version = begin
           MiniTest::Unit::VERSION
         rescue LoadError
           'unknown'
         end
-        
+
         $stderr.puts "Detected MiniTest version: #{mini_test_version}" if $options['debug']
-        
+
         if (mini_test_version >= '1.3.0') && (mini_test_version <= '1.3.1')
           include Mocha::Integration::MiniTest::Version13
         elsif (mini_test_version == '1.4.0')
@@ -37,15 +39,17 @@ if !MiniTest::Unit::TestCase.ancestors.include?(Mocha::API)
           include Mocha::Integration::MiniTest::Version142To172
         elsif (mini_test_version == '2.0.0')
           include Mocha::Integration::MiniTest::Version200
-        elsif (mini_test_version >= '2.0.1') && (mini_test_version <= '2.0.2')
-          include Mocha::Integration::MiniTest::Version201To202
-        elsif (mini_test_version > '2.0.2')
+        elsif (mini_test_version >= '2.0.1') && (mini_test_version <= '2.2.2')
+          include Mocha::Integration::MiniTest::Version201To222
+        elsif (mini_test_version >= '2.3.0') && (mini_test_version <= '2.5.1')
+          include Mocha::Integration::MiniTest::Version230To251
+        elsif (mini_test_version > '2.5.1')
           $stderr.puts "*** MiniTest integration has not been verified but patching anyway ***" if $options['debug']
-          include Mocha::Integration::MiniTest::Version201To202
+          include Mocha::Integration::MiniTest::Version230To251
         else
           $stderr.puts "*** No Mocha integration for MiniTest version ***" if $options['debug']
         end
-        
+
       end
     end
   end

data/lib/mocha/integration/mini_test/{version_201_to_202.rb → version_201_to_222.rb}

@@ -2,14 +2,14 @@ require 'mocha/integration/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-      
-      module Version201To202
+
+      module Version201To222
         def self.included(mod)
-          $stderr.puts "Monkey patching MiniTest >= v2.0.1 <= v2.0.2" if $options['debug']
+          $stderr.puts "Monkey patching MiniTest >= v2.0.1 <= v2.2.2" if $options['debug']
         end
         def run runner
           trap 'INFO' do
@@ -17,7 +17,7 @@ module Mocha
             warn "%s#%s %.2fs" % [self.class, self.__name__, time]
             runner.status $stderr
           end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
-          
+
           assertion_counter = AssertionCounter.new(self)
           result = ""
           begin
@@ -49,9 +49,9 @@ module Mocha
           result
         end
       end
-      
+
     end
-    
+
   end
-  
+
 end

data/lib/mocha/integration/mini_test/version_230_to_251.rb

@@ -0,0 +1,59 @@
+require 'mocha/integration/mini_test/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+
+  module Integration
+
+    module MiniTest
+
+      module Version230To251
+        def self.included(mod)
+          $stderr.puts "Monkey patching MiniTest >= v2.3.0 <= v2.5.1" if $options['debug']
+        end
+        def run runner
+          trap 'INFO' do
+            time = runner.start_time ? Time.now - runner.start_time : 0
+            warn "%s#%s %.2fs" % [self.class, self.__name__, time]
+            runner.status $stderr
+          end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+
+          assertion_counter = AssertionCounter.new(self)
+          result = ""
+          begin
+            begin
+              @passed = nil
+              self.setup
+              self.run_setup_hooks
+              self.__send__ self.__name__
+              mocha_verify(assertion_counter)
+              result = "." unless io?
+              @passed = true
+            rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+              raise
+            rescue Exception => e
+              @passed = false
+              result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+            ensure
+              begin
+                self.run_teardown_hooks
+                self.teardown
+              rescue *::MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
+                raise
+              rescue Exception => e
+                result = runner.puke self.class, self.__name__, Mocha::Integration::MiniTest.translate(e)
+              end
+              trap 'INFO', 'DEFAULT' if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
+            end
+          ensure
+            mocha_teardown
+          end
+          result
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mocha/integration/test_unit.rb

@@ -1,22 +1,24 @@
 require 'mocha/api'
+require 'mocha/options'
 
 if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
- 
+
   require 'mocha/integration/test_unit/gem_version_200'
   require 'mocha/integration/test_unit/gem_version_201_to_202'
-  require 'mocha/integration/test_unit/gem_version_203_to_209'
+  require 'mocha/integration/test_unit/gem_version_203_to_220'
+  require 'mocha/integration/test_unit/gem_version_230_to_233'
   require 'mocha/integration/test_unit/ruby_version_185_and_below'
   require 'mocha/integration/test_unit/ruby_version_186_and_above'
-  
+
   module Test
     module Unit
       class TestCase
-        
+
         include Mocha::API
-        
+
         alias_method :run_before_mocha, :run
         remove_method :run
-        
+
         test_unit_version = begin
           load 'test/unit/version.rb'
           Test::Unit::VERSION
@@ -39,17 +41,19 @@ if !Test::Unit::TestCase.ancestors.include?(Mocha::API)
           include Mocha::Integration::TestUnit::GemVersion200
         elsif (test_unit_version >= '2.0.1') && (test_unit_version <= '2.0.2')
           include Mocha::Integration::TestUnit::GemVersion201To202
-        elsif (test_unit_version >= '2.0.3') && (test_unit_version <= '2.0.9')
-          include Mocha::Integration::TestUnit::GemVersion203To209
-        elsif (test_unit_version > '2.0.9')
+        elsif (test_unit_version >= '2.0.3') && (test_unit_version <= '2.2.0')
+          include Mocha::Integration::TestUnit::GemVersion203To220
+        elsif (test_unit_version >= '2.3.0') && (test_unit_version <= '2.3.3')
+          include Mocha::Integration::TestUnit::GemVersion230To233
+        elsif (test_unit_version > '2.3.3')
           $stderr.puts "*** Test::Unit integration has not been verified but patching anyway ***" if $options['debug']
-          include Mocha::Integration::TestUnit::GemVersion203To209
+          include Mocha::Integration::TestUnit::GemVersion230To233
         else
           $stderr.puts "*** No Mocha integration for Test::Unit version ***" if $options['debug']
         end
-        
+
       end
     end
   end
-  
-end
+
+end

data/lib/mocha/integration/test_unit/{gem_version_203_to_209.rb → gem_version_203_to_220.rb}

@@ -3,14 +3,14 @@ require 'mocha/integration/test_unit/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
-  
+
   module Integration
-    
+
     module TestUnit
-      
-      module GemVersion203To209
+
+      module GemVersion203To220
         def self.included(mod)
-          $stderr.puts "Monkey patching Test::Unit gem >= v2.0.3 and <= v2.0.9" if $options['debug']
+          $stderr.puts "Monkey patching Test::Unit gem >= v2.0.3 and <= v2.2.0" if $options['debug']
         end
         def run(result)
           assertion_counter = AssertionCounter.new(result)
@@ -44,9 +44,9 @@ module Mocha
           end
         end
       end
-      
+
     end
-    
+
   end
-  
+
 end

data/lib/mocha/integration/test_unit/gem_version_230_to_233.rb

@@ -0,0 +1,58 @@
+require 'test/unit/testcase'
+require 'mocha/integration/test_unit/assertion_counter'
+require 'mocha/expectation_error'
+
+module Mocha
+
+  module Integration
+
+    module TestUnit
+
+      module GemVersion230To233
+        def self.included(mod)
+          $stderr.puts "Monkey patching Test::Unit gem >= v2.3.0 and <= v2.3.3" if $options['debug']
+        end
+        def run(result)
+          assertion_counter = AssertionCounter.new(result)
+          begin
+            @internal_data.test_started
+            @_result = result
+            yield(Test::Unit::TestCase::STARTED, name)
+            yield(Test::Unit::TestCase::STARTED_OBJECT, name)
+            begin
+              begin
+                run_setup
+                run_test
+                run_cleanup
+                mocha_verify(assertion_counter)
+                add_pass
+              rescue Mocha::ExpectationError => e
+                add_failure(e.message, e.backtrace)
+              rescue Exception
+                @internal_data.interrupted
+                raise unless handle_exception($!)
+              ensure
+                begin
+                  run_teardown
+                rescue Exception
+                  raise unless handle_exception($!)
+                end
+              end
+            ensure
+              mocha_teardown
+            end
+            @internal_data.test_finished
+            result.add_run
+            yield(Test::Unit::TestCase::FINISHED, name)
+            yield(Test::Unit::TestCase::FINISHED_OBJECT, name)
+          ensure
+            # @_result = nil # For test-spec's after_all :<
+          end
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/mocha/mock.rb

@@ -1,6 +1,6 @@
+require 'metaclass'
 require 'mocha/expectation'
 require 'mocha/expectation_list'
-require 'mocha/metaclass'
 require 'mocha/names'
 require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
@@ -8,12 +8,12 @@ require 'mocha/unexpected_invocation'
 require 'mocha/argument_iterator'
 
 module Mocha # :nodoc:
-  
+
   # Traditional mock object.
   #
   # Methods return an Expectation which can be further modified by methods on Expectation.
   class Mock
-    
+
     # :call-seq: expects(method_name) -> expectation
     #            expects(method_names_vs_return_values) -> last expectation
     #
@@ -48,7 +48,7 @@ module Mocha # :nodoc:
         @expectations.add(expectation)
       }
     end
-    
+
     # :call-seq: stubs(method_name) -> expectation
     #            stubs(method_names_vs_return_values) -> last expectation
     #
@@ -81,7 +81,7 @@ module Mocha # :nodoc:
         @expectations.add(expectation)
       }
     end
-    
+
     # :call-seq: responds_like(responder) -> mock
     #
     # Constrains the +mock+ so that it can only expect or stub methods to which +responder+ responds. The constraint is only applied at method invocation time.
@@ -126,9 +126,9 @@ module Mocha # :nodoc:
       @responder = object
       self
     end
-    
+
     # :stopdoc:
-    
+
     def initialize(name = nil, &block)
       @name = name || DefaultName.new(self)
       @expectations = ExpectationList.new
@@ -142,13 +142,13 @@ module Mocha # :nodoc:
     alias_method :__expects__, :expects
 
     alias_method :__stubs__, :stubs
-    
+
     alias_method :quacks_like, :responds_like
 
     def stub_everything
       @everything_stubbed = true
     end
-    
+
     def method_missing(symbol, *arguments, &block)
       if @responder and not @responder.respond_to?(symbol)
         raise NoMethodError, "undefined method `#{symbol}' for #{self.mocha_inspect} which responds like #{@responder.mocha_inspect}"
@@ -165,7 +165,7 @@ module Mocha # :nodoc:
         end
       end
     end
-    
+
     def respond_to?(symbol, include_private = false)
       if @responder then
         if @responder.method(:respond_to?).arity > 1
@@ -177,19 +177,19 @@ module Mocha # :nodoc:
         @everything_stubbed || @expectations.matches_method?(symbol)
       end
     end
-    
+
     def __verified__?(assertion_counter = nil)
       @expectations.verified?(assertion_counter)
     end
-    
+
     def mocha_inspect
       @name.mocha_inspect
     end
-    
+
     def inspect
       mocha_inspect
     end
-    
+
     def ensure_method_not_already_defined(method_name)
       self.__metaclass__.send(:undef_method, method_name) if self.__metaclass__.method_defined?(method_name)
     end

data/lib/mocha/object.rb

@@ -110,7 +110,7 @@ module Mocha
     #   multiplier.double(2) # => 4
     #   multiplier.stubs(:double).raises
     #   multiplier.double(2) # => raises exception
-    #   multiplier.unstubs(:double)
+    #   multiplier.unstub(:double)
     #   multiplier.double(2) # => 4
     #
     # The original implementation of <tt>Multiplier#double</tt> is replaced temporarily.