From bf32265743b92f51482f7fca7212535d40a7cf3c Mon Sep 17 00:00:00 2001 From: Christopher Aue Date: Wed, 30 Aug 2017 11:03:51 +0200 Subject: Allowed to pass multiple exceptions to assert_raise --- test/assert.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/assert.rb b/test/assert.rb index 6760ae0a7..fb7ae9ab8 100644 --- a/test/assert.rb +++ b/test/assert.rb @@ -143,17 +143,19 @@ def assert_not_include(collection, obj, msg = nil) assert_false(collection.include?(obj), msg, diff) end -def assert_raise(exc, msg = nil) +def assert_raise(*exc) return true unless $mrbtest_assert $mrbtest_assert_idx += 1 + msg = (exc.last.is_a? String) ? exc.pop : nil + begin yield msg ||= "Expected to raise #{exc} but nothing was raised." diff = nil $mrbtest_assert.push [$mrbtest_assert_idx, msg, diff] false - rescue exc + rescue *exc true rescue Exception => e msg ||= "Expected to raise #{exc}, not" -- cgit v1.2.3