mocha 0.10.5 → 0.11.0

data/lib/mocha/expectation_error.rb

@@ -3,7 +3,7 @@ require 'mocha/backtrace_filter'
 module Mocha
 
   class ExpectationError < Exception
-    
+
     def initialize(message = nil, backtrace = [])
       super(message)
       filter = BacktraceFilter.new
@@ -11,5 +11,5 @@ module Mocha
     end
 
   end
-  
+
 end

data/lib/mocha/expectation_list.rb

@@ -1,11 +1,11 @@
-module Mocha # :nodoc:
+module Mocha
 
   class ExpectationList
 
     def initialize
       @expectations = []
     end
-    
+
     def add(expectation)
       @expectations.unshift(expectation)
       expectation
@@ -14,31 +14,31 @@ module Mocha # :nodoc:
     def remove_all_matching_method(method_name)
       @expectations.reject! { |expectation| expectation.matches_method?(method_name) }
     end
-    
+
     def matches_method?(method_name)
       @expectations.any? { |expectation| expectation.matches_method?(method_name) }
     end
-    
+
     def match(method_name, *arguments)
       matching_expectations(method_name, *arguments).first
     end
-    
+
     def match_allowing_invocation(method_name, *arguments)
       matching_expectations(method_name, *arguments).detect { |e| e.invocations_allowed? }
     end
-    
+
     def verified?(assertion_counter = nil)
       @expectations.all? { |expectation| expectation.verified?(assertion_counter) }
     end
-    
+
     def to_a
       @expectations
     end
-    
+
     def to_set
       @expectations.to_set
     end
-    
+
     def length
       @expectations.length
     end
@@ -48,11 +48,11 @@ module Mocha # :nodoc:
     end
 
     private
-    
+
     def matching_expectations(method_name, *arguments)
       @expectations.select { |e| e.match?(method_name, *arguments) }
     end
-    
+
   end
 
 end

data/lib/mocha/in_state_ordering_constraint.rb

@@ -1,19 +1,19 @@
 module Mocha
 
   class InStateOrderingConstraint
-  
+
     def initialize(state_predicate)
       @state_predicate = state_predicate
     end
-  
+
     def allows_invocation_now?
       @state_predicate.active?
     end
-  
+
     def mocha_inspect
       "when #{@state_predicate.mocha_inspect}"
     end
-  
+
   end
 
-end
+end

data/lib/mocha/inspect.rb

@@ -1,7 +1,7 @@
 require 'date'
 
 module Mocha
-  
+
   module ObjectMethods
     def mocha_inspect
       address = self.__id__ * 2
@@ -9,37 +9,37 @@ module Mocha
       inspect =~ /#</ ? "#<#{self.class}:0x#{'%x' % address}>" : inspect
     end
   end
-  
+
   module StringMethods
     def mocha_inspect
       inspect.gsub(/\"/, "'")
     end
   end
-  
+
   module ArrayMethods
     def mocha_inspect
       "[#{collect { |member| member.mocha_inspect }.join(', ')}]"
     end
   end
-  
+
   module HashMethods
     def mocha_inspect
       "{#{collect { |key, value| "#{key.mocha_inspect} => #{value.mocha_inspect}" }.join(', ')}}"
     end
   end
-  
+
   module TimeMethods
     def mocha_inspect
       "#{inspect} (#{to_f} secs)"
     end
   end
-  
+
   module DateMethods
     def mocha_inspect
       to_s
     end
   end
-  
+
 end
 
 class Object
@@ -64,4 +64,4 @@ end
 
 class Date
   include Mocha::DateMethods
-end
+end

data/lib/mocha/instance_method.rb

@@ -4,14 +4,6 @@ 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)
@@ -19,14 +11,6 @@ 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
+end

data/lib/mocha/integration.rb

@@ -1,9 +1,9 @@
 module Mocha
-  
+
   module Integration
-    
+
     class << self
-    
+
       def monkey_patches
         patches = []
         if test_unit_testcase_defined? && !test_unit_testcase_inherits_from_miniunit_testcase?
@@ -14,23 +14,23 @@ module Mocha
         end
         patches
       end
-      
+
       def test_unit_testcase_defined?
         defined?(Test) && defined?(Test::Unit) && defined?(Test::Unit::TestCase)
       end
-      
+
       def mini_unit_testcase_defined?
         defined?(MiniTest) && defined?(MiniTest::Unit) && defined?(MiniTest::Unit::TestCase)
       end
-      
+
       def test_unit_testcase_inherits_from_miniunit_testcase?
         test_unit_testcase_defined? && mini_unit_testcase_defined? && Test::Unit::TestCase.ancestors.include?(MiniTest::Unit::TestCase)
       end
-      
+
     end
-    
+
   end
-  
+
 end
 
 Mocha::Integration.monkey_patches.each do |patch|

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

@@ -1,23 +1,23 @@
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-      
+
       class AssertionCounter
-        
+
         def initialize(test_case)
           @test_case = test_case
         end
-        
+
         def increment
           @test_case._assertions += 1
         end
-        
+
       end
-      
+
     end
-    
+
   end
-  
+
 end

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

@@ -1,20 +1,20 @@
 require 'mocha/expectation_error'
 
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-      
+
       def self.translate(exception)
         return exception unless exception.kind_of?(::Mocha::ExpectationError)
         translated_exception = ::MiniTest::Assertion.new(exception.message)
         translated_exception.set_backtrace(exception.backtrace)
         translated_exception
       end
-      
+
     end
-    
+
   end
-  
+
 end

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

@@ -1,11 +1,11 @@
 require 'mocha/integration/mini_test/assertion_counter'
 
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-      
+
       module Version13
         def self.included(mod)
           $stderr.puts "Monkey patching MiniTest v1.3" if $mocha_options['debug']
@@ -36,9 +36,9 @@ module Mocha
           result
         end
       end
-      
+
     end
-    
+
   end
-  
+
 end

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

@@ -2,11 +2,11 @@ require 'mocha/integration/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-      
+
       module Version140
         def self.included(mod)
           $stderr.puts "Monkey patching MiniTest v1.4.0" if $mocha_options['debug']
@@ -37,9 +37,9 @@ module Mocha
           result
         end
       end
-      
+
     end
-    
+
   end
-  
+
 end

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

@@ -2,11 +2,11 @@ require 'mocha/integration/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-            
+
       module Version141
         def self.included(mod)
           $stderr.puts "Monkey patching MiniTest v1.4.1"
@@ -48,9 +48,9 @@ module Mocha
           result
         end
       end
-      
+
     end
-    
+
   end
-  
+
 end

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

@@ -2,11 +2,11 @@ require 'mocha/integration/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-      
+
       module Version142To172
         def self.included(mod)
           $stderr.puts "Monkey patching MiniTest >= v1.4.2 and <= v1.7.2" if $mocha_options['debug']
@@ -17,7 +17,7 @@ module Mocha
               (Time.now - runner.start_time)]
             runner.status $stderr
           end if ::MiniTest::Unit::TestCase::SUPPORTS_INFO_SIGNAL
-          
+
           assertion_counter = AssertionCounter.new(self)
           result = '.'
           begin
@@ -48,9 +48,9 @@ module Mocha
           result
         end
       end
-      
+
     end
-    
+
   end
-  
+
 end

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

@@ -2,11 +2,11 @@ require 'mocha/integration/mini_test/assertion_counter'
 require 'mocha/expectation_error'
 
 module Mocha
-  
+
   module Integration
-    
+
     module MiniTest
-      
+
       module Version200
         def self.included(mod)
           $stderr.puts "Monkey patching MiniTest v2.0.0" if $mocha_options['debug']
@@ -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