admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a conflict between #4407 and #4540

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-07-29 01:25:58 +09:00
parent 2ebc6d5b6f
commit ff43b2b97c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/assert.rb
+1 -1
View File
@@ -329,7 +329,7 @@ def assert_raise_with_message_pattern(*args, &block)
end end
def _assert_raise_with_message(type, exc, exp_msg, msg = nil, &block) def _assert_raise_with_message(type, exc, exp_msg, msg = nil, &block)
e = msg ? assert_raise(exc, msg, &block) : assert_raise(exc, &block) e = msg ? assert_raise(exc, msg, &block) : assert_raise(exc, &block)
e ? ($mrbtest_assert_idx -= 1) : (return e) e ? ($mrbtest_assert_idx[-1]-=1) : (return e)
err_msg = e.message err_msg = e.message
unless ret = type == :pattern ? _str_match?(exp_msg, err_msg) : exp_msg == err_msg unless ret = type == :pattern ? _str_match?(exp_msg, err_msg) : exp_msg == err_msg