From c45cca8e36401f6d95d851befef35879a5629182 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 25 Jun 2017 13:04:36 +0100
Subject: [PATCH] test: simplify minitest inclusion.

The previous version seems needlessly complicated given we only support
a single Ruby version. It was also blowing up on Bundler 1.15.X.
---
 Library/Homebrew/dev-cmd/test.rb       |  2 +-
 Library/Homebrew/formula_assertions.rb | 22 +---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb
index 738a0ef290..a8661179fb 100644
--- a/Library/Homebrew/dev-cmd/test.rb
+++ b/Library/Homebrew/dev-cmd/test.rb
@@ -83,7 +83,7 @@ module Homebrew
             exec(*args)
           end
         end
-      rescue Assertions::FailedAssertion => e
+      rescue MiniTest::Assertion => e
         ofail "#{f.full_name}: failed"
         puts e.message
       rescue Exception => e
diff --git a/Library/Homebrew/formula_assertions.rb b/Library/Homebrew/formula_assertions.rb
index 047b40abc3..f81087a3dd 100644
--- a/Library/Homebrew/formula_assertions.rb
+++ b/Library/Homebrew/formula_assertions.rb
@@ -1,26 +1,6 @@
 module Homebrew
   module Assertions
-    if defined?(Gem)
-      begin
-        gem "minitest", "< 5.0.0"
-      rescue Gem::LoadError
-        require "test/unit/assertions"
-      else
-        require "minitest/unit"
-        require "test/unit/assertions"
-      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
-
+    require "test/unit/assertions"
     include ::Test::Unit::Assertions
 
     # Returns the output of running cmd, and asserts the exit status