Skip to content

Commit 7023824

Browse files
authored
Merge pull request #48 from deivid-rodriguez/fix_2_4_ci
Fix Ruby 2.4 test run
2 parents da15e3c + a8968f4 commit 7023824

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

test/lib/core_assertions.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def assert_raise(*exp, &b)
213213
}
214214

215215
assert expected, proc {
216-
exception_details(e, message(msg) {"#{mu_pp(exp)} exception expected, not"}.call)
216+
flunk(message(msg) {"#{mu_pp(exp)} exception expected, not #{mu_pp(e)}"})
217217
}
218218

219219
return e
@@ -378,7 +378,7 @@ def assert_join_threads(threads, message = nil)
378378
msg = "exceptions on #{errs.length} threads:\n" +
379379
errs.map {|t, err|
380380
"#{t.inspect}:\n" +
381-
err.full_message(highlight: false, order: :top)
381+
RUBY_VERSION >= "2.5.0" ? err.full_message(highlight: false, order: :top) : err.message
382382
}.join("\n---\n")
383383
if message
384384
msg = "#{message}\n#{msg}"

0 commit comments

Comments
 (0)