diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-09-06 19:31:24 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-09-06 19:31:24 +0900 |
commit | 544e37f184d38d52423d163b711cd626e53ff75b (patch) | |
tree | 857f98f8e5cfec3761d7088825b9d91611864f01 /tool | |
parent | 940a19e4b3ae1ce466c3bc912175b4ef7c615c53 (diff) | |
download | ruby-544e37f184d38d52423d163b711cd626e53ff75b.tar.gz |
Simplify conditions for CoreAssertion initialization
Diffstat (limited to 'tool')
-rw-r--r-- | tool/lib/core_assertions.rb | 7 | ||||
-rw-r--r-- | tool/lib/test/unit/assertions.rb | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tool/lib/core_assertions.rb b/tool/lib/core_assertions.rb index 2e4235fb69..a670c77310 100644 --- a/tool/lib/core_assertions.rb +++ b/tool/lib/core_assertions.rb @@ -24,13 +24,11 @@ module Test end module CoreAssertions + require_relative 'envutil' + if defined?(MiniTest) - require_relative 'envutil' # for ruby core testing include MiniTest::Assertions - - # Compatibility hack for assert_raise - Test::Unit::AssertionFailedError = MiniTest::Assertion else module MiniTest class Assertion < Exception; end @@ -38,7 +36,6 @@ module Test end require 'pp' - require_relative 'envutil' include Test::Unit::Assertions end diff --git a/tool/lib/test/unit/assertions.rb b/tool/lib/test/unit/assertions.rb index c61f296da9..b99fb19adf 100644 --- a/tool/lib/test/unit/assertions.rb +++ b/tool/lib/test/unit/assertions.rb @@ -303,5 +303,9 @@ EOT template.gsub(/\G((?:[^\\]|\\.)*?)(\\)?\?/) { $1 + ($2 ? "?" : mu_pp(arguments.shift)) } end end + + # Compatibility hack for assert_raise + AssertionFailedError = MiniTest::Assertion + end end |