From 34a8bfa971e19985224b42af087778a4c14e0e6e Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 7 May 2012 09:08:17 +0000 Subject: * lib/minitest/unit.rb (assert_match): replace matcher only if both matcher and obj are String. fix r35541. [Bug #6405] DON'T COMMIT IF YOU CAN'T RUN TEST. FIX AS SOON AS POSSIBLE YOU BREAK TESTS. patched by ayumin. https://github.com/seattlerb/minitest/pull/124 * lib/minitest/unit.rb (refute_match): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35563 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/minitest/unit.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/minitest') diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index 0a0e10816e..707ec5e055 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -281,8 +281,8 @@ module MiniTest def assert_match matcher, obj, msg = nil msg = message(msg) { "Expected #{mu_pp matcher} to match #{mu_pp obj}" } - assert_respond_to matcher, :"=~" - matcher = Regexp.new Regexp.escape matcher if String === matcher + assert_respond_to obj, :"=~" + matcher = Regexp.new Regexp.escape matcher if String === matcher and String === obj assert matcher =~ obj, msg end @@ -582,8 +582,8 @@ module MiniTest def refute_match matcher, obj, msg = nil msg = message(msg) {"Expected #{mu_pp matcher} to not match #{mu_pp obj}"} - assert_respond_to matcher, :"=~" - matcher = Regexp.new Regexp.escape matcher if String === matcher + assert_respond_to obj, :"=~" + matcher = Regexp.new Regexp.escape matcher if String === matcher and String === obj refute matcher =~ obj, msg end -- cgit v1.2.3