diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/test/unit/assertions.rb | 9 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Sat Feb 5 22:01:59 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * lib/test/unit/assertions.rb (Test::Unit::Assertions#assert): + revert r30796. r30797 and r30798 are an alternative fix. + [ruby-dev:43174] + Sat Feb 5 21:47:09 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (mlhs_basic): include mlhs_post for ripper. a patch diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb index 9a646c0867..5a0c01a4fb 100644 --- a/lib/test/unit/assertions.rb +++ b/lib/test/unit/assertions.rb @@ -10,10 +10,13 @@ module Test obj.pretty_inspect.chomp end - def assert(test, msg = nil) + UNASSIGNED = Object.new # :nodoc: + + def assert(test, msg = UNASSIGNED) case msg - when String, Proc, NilClass - # do nothing + when UNASSIGNED + msg = nil + when String, Proc else bt = caller.reject { |s| s.rindex(MiniTest::MINI_DIR, 0) } raise ArgumentError, "assertion message must be String or Proc, but #{msg.class} was given.", bt |