From ef1af87ed2f3816449702dcad7b66563581e271a Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 26 Dec 2008 05:54:09 +0000 Subject: [PATCH] merges r20798 and r20800 from trunk into ruby_1_9_1. * lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of): should assert by instance_of?, not ===. [ruby-dev:37458] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/minitest/unit.rb | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index afbe2d8b2f..7fc96e7738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Dec 16 22:15:17 2008 Yukihiro Matsumoto + + * lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of): + should assert by instance_of?, not ===. [ruby-dev:37458] + + * lib/minitest/unit.rb (MiniTest::Assertions#assert_instance_of): + typo fixed. + Mon Dec 15 20:59:10 2008 Tanaka Akira * ext/pty/pty.c (child_info): add slavename. diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb index 77176240c5..cbec247d57 100644 --- a/lib/minitest/unit.rb +++ b/lib/minitest/unit.rb @@ -104,7 +104,7 @@ module MiniTest msg = message(msg) { "Expected #{mu_pp(obj)} to be an instance of #{cls}, not #{obj.class}" } flip = (Module === obj) && ! (Module === cls) # HACK for specs obj, cls = cls, obj if flip - assert cls === obj, msg + assert obj.instance_of?(cls), msg end def assert_kind_of cls, obj, msg = nil # TODO: merge with instance_of