Imported minitest 1.6.0 r5717.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 0 deletions

diff --git a/lib/minitest/mock.rb b/lib/minitest/mock.rb
index 54af28c453..ed44164448 100644
--- a/lib/minitest/mock.rb
+++ b/lib/minitest/mock.rb
@@ -16,6 +16,7 @@ module MiniTest
     def expect(name, retval, args=[])
       n, r, a = name, retval, args # for the closure below
       @expected_calls[name] = { :retval => retval, :args => args }
+      self.class.__send__ :remove_method, name if respond_to? name
       self.class.__send__(:define_method, name) { |*x|
         raise ArgumentError unless @expected_calls[n][:args].size == x.size
         @actual_calls[n] << { :retval => r, :args => x }