test/unit/class_method_test.rb in mocha-0.5.5 vs test/unit/class_method_test.rb in mocha-0.5.6

@@ -88,10 +88,11 @@
     mocha = Mocha::Mock.new
     klass.define_instance_method(:mocha) { mocha }
     mocha.expects(:method_x).with(:param1, :param2).returns(:result)
     method = ClassMethod.new(klass, :method_x)
     
+    method.hide_original_method
     method.define_new_method
     result = klass.method_x(:param1, :param2)
     
     assert_equal :result, result
     mocha.verify
@@ -110,10 +111,11 @@
     klass = Class.new { def self.method_x; end }
     method = ClassMethod.new(klass, :method_x)
     hidden_method_x = method.hidden_method.to_sym
     klass.define_instance_method(hidden_method_x) { :original_result }
 
+    method.remove_new_method
     method.restore_original_method
     
     assert_equal :original_result, klass.method_x 
     assert_equal false, klass.respond_to?(hidden_method_x)
   end
@@ -128,10 +130,11 @@
   end
 
   def test_should_call_hide_original_method
     klass = Class.new { def self.method_x; end }
     method = ClassMethod.new(klass, :method_x)
+    method.hide_original_method
     method.define_instance_accessor(:hide_called)
     method.replace_instance_method(:hide_original_method) { self.hide_called = true }
     
     method.stub
     
@@ -187,9 +190,10 @@
   
   def test_should_return_mock_for_stubbee
     mocha = Object.new
     stubbee = Object.new
     stubbee.define_instance_accessor(:mocha) { mocha }
+    stubbee.mocha = nil
     method = ClassMethod.new(stubbee, :method_name)
     assert_equal stubbee.mocha, method.mock
   end
 
 end
\ No newline at end of file