mirror of
https://github.com/ruby/ruby.git
synced 2025-08-26 14:34:39 +02:00
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
This commit is contained in:
parent
ef1374eac9
commit
ef1af87ed2
2 changed files with 9 additions and 1 deletions
|
@ -1,3 +1,11 @@
|
|||
Tue Dec 16 22:15:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* 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 <akr@fsij.org>
|
||||
|
||||
* ext/pty/pty.c (child_info): add slavename.
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue