From 44d2617030f8407e74036decd93d94b33db881e7 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Sat, 18 Feb 2017 16:52:36 +0100
Subject: [PATCH] Handle `Homebrew.failed` in `spec_helper`.

---
 Library/Homebrew/test/spec_helper.rb |  6 ++++++
 Library/Homebrew/test/utils_spec.rb  | 14 ++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index 292c5786aa..63ffe63fe8 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -33,6 +33,8 @@ RSpec.configure do |config|
     begin
       TEST_DIRECTORIES.each(&:mkpath)
 
+      @__homebrew_failed = Homebrew.failed?
+
       @__files_before_test = Find.find(TEST_TMPDIR).map { |f| f.sub(TEST_TMPDIR, "") }
 
       @__argv = ARGV.dup
@@ -72,6 +74,10 @@ RSpec.configure do |config|
         file leak detected:
         #{diff.map { |f| "  #{f}" }.join("\n")}
       EOS
+
+      Homebrew.failed = @__homebrew_failed
     end
   end
 end
+
+RSpec::Matchers.alias_matcher :have_failed, :be_failed
diff --git a/Library/Homebrew/test/utils_spec.rb b/Library/Homebrew/test/utils_spec.rb
index de6b287d27..040ad630be 100644
--- a/Library/Homebrew/test/utils_spec.rb
+++ b/Library/Homebrew/test/utils_spec.rb
@@ -1,7 +1,5 @@
 require "utils"
 
-RSpec::Matchers.alias_matcher :have_failed, :be_failed
-
 describe "globally-scoped helper methods" do
   let(:dir) { @dir = Pathname.new(Dir.mktmpdir) }
 
@@ -13,15 +11,11 @@ describe "globally-scoped helper methods" do
 
   describe "#ofail" do
     it "sets Homebrew.failed to true" do
-      begin
-        shutup do
-          ofail "foo"
-        end
+      expect {
+        ofail "foo"
+      }.to output("Error: foo\n").to_stderr
 
-        expect(Homebrew).to have_failed
-      ensure
-        Homebrew.failed = false
-      end
+      expect(Homebrew).to have_failed
     end
   end