aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-07-11 17:23:04 -0500
committerJack Nagel2014-07-11 17:23:39 -0500
commit4ad743cced0e15d029e5caa8b5c44a804c135dbb (patch)
tree11213d6aa25f32da2d6fc8530e9ea664a1c11a0a
parentdc6433a6f2e69011510fbd1bd5cd0f5baafbafa5 (diff)
downloadhomebrew-4ad743cced0e15d029e5caa8b5c44a804c135dbb.tar.bz2
Try to workaround gem packaging shenanigans
-rw-r--r--Library/Homebrew/cmd/test.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/Library/Homebrew/cmd/test.rb b/Library/Homebrew/cmd/test.rb
index 35d7fb1e0..f1b9967f4 100644
--- a/Library/Homebrew/cmd/test.rb
+++ b/Library/Homebrew/cmd/test.rb
@@ -9,14 +9,19 @@ module Homebrew
gem "minitest", "< 5.0.0"
rescue Gem::LoadError
require "test/unit/assertions"
- FailedAssertion = Test::Unit::AssertionFailedError
else
require "minitest/unit"
require "test/unit/assertions"
- FailedAssertion = MiniTest::Assertion
end
else
require "test/unit/assertions"
+ end
+
+ if defined?(MiniTest::Assertion)
+ FailedAssertion = MiniTest::Assertion
+ elsif defined?(Minitest::Assertion)
+ FailedAssertion = Minitest::Assertion
+ else
FailedAssertion = Test::Unit::AssertionFailedError
end