From a152da5fcd247d723cfc5e77a4a33ab1877ff636 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 27 Jan 2011 14:24:40 +0000
Subject: merges a part of revision 5917 in MiniTest's repository into
 ruby_1_9_2.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30678 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/minitest/test_mini_mock.rb | 6 ++++++
 version.h                       | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/minitest/test_mini_mock.rb b/test/minitest/test_mini_mock.rb
index 0f16ae930e..c189cb7df7 100644
--- a/test/minitest/test_mini_mock.rb
+++ b/test/minitest/test_mini_mock.rb
@@ -75,6 +75,12 @@ class TestMiniMock < MiniTest::Unit::TestCase
     util_verify_bad
   end
 
+  def test_no_method_error_on_unexpected_methods
+    assert_raises NoMethodError do
+      @mock.bar
+    end
+  end
+
   def util_verify_bad
     assert_raises MockExpectationError do
       @mock.verify
diff --git a/version.h b/version.h
index a1d312db19..ae3d30eca8 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 163
+#define RUBY_PATCHLEVEL 164
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-- 
cgit v1.2.3