From 9a4f9f3424d6e0b785b2f4cfbcec3f2c2d0ecdcf Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 27 Jun 2014 15:44:20 +0000 Subject: reapply r46568 "assertions.rb: refine message" `exception` is an expected exception class, not the raised instance, so the result message cannot have any backtraces. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/lib/test/unit/assertions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/lib') diff --git a/test/lib/test/unit/assertions.rb b/test/lib/test/unit/assertions.rb index 869baf505f..435719a22e 100644 --- a/test/lib/test/unit/assertions.rb +++ b/test/lib/test/unit/assertions.rb @@ -126,7 +126,7 @@ module Test raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}" end - ex = assert_raise(exception, *msg) {yield} + ex = assert_raise(exception, msg || proc {"Exception(#{exception}) with message matches to #{expected.inspect}"}) {yield} msg = message(msg, "") {"Expected Exception(#{exception}) was raised, but the message doesn't match"} if assert == :assert_equal -- cgit v1.2.3