- Fixed deprecation warning using stub with methods using keyword arg…

…uments. (Nakilon)

[git-p4: depot-paths = "//src/minitest/dev/": change = 13019]

lib/minitest/mock.rb

@@ -222,9 +222,9 @@ def stub name, val_or_callable, *block_args
 
     metaclass.send :alias_method, new_name, name
 
-    metaclass.send :define_method, name do |*args, &blk|
+    metaclass.send :define_method, name do |*args, **kwargs, &blk|
       if val_or_callable.respond_to? :call then
-        val_or_callable.call(*args, &blk)
+        val_or_callable.call(*args, **kwargs, &blk)
       else
         blk.call(*block_args) if blk
         val_or_callable

test/minitest/test_minitest_mock.rb

@@ -591,6 +591,18 @@ def self.identity arg
     end
   end
 
+  class Keywords
+    def self.args req, kw1:, kw2:24
+      [req, kw1, kw2]
+    end
+  end
+
+  def test_stub_callable_keyword_args
+    Keywords.stub :args, ->(*args, **kws) { 42 } do
+      @tc.assert_equal 42, Keywords.args("woot", kw1:314)
+    end
+  end
+
   def test_stub_callable_block_5 # from tenderlove
     @assertion_count += 1
     Foo.stub5 :blocking, Bar.new do