Refactor `shutup`.

5 files changed, 32 insertions, 52 deletions

diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb
index e86e20027..a826cfcf0 100644
--- a/Library/Homebrew/cask/spec/spec_helper.rb
+++ b/Library/Homebrew/cask/spec/spec_helper.rb
@@ -22,6 +22,8 @@ $LOAD_PATH.push(project_root.join("lib").to_s)
 ENV["HOMEBREW_NO_EMOJI"] = "1"
 ENV["HOMEBREW_CASK_OPTS"] = nil
 
+require "test/helper/shutup"
+
 Dir["#{project_root}/spec/support/*.rb"].each(&method(:require))
 
 # from Homebrew. Provides expects method.
@@ -63,5 +65,5 @@ Hbc.caskroom = Hbc.homebrew_prefix.join("TestCaskroom")
 
 RSpec.configure do |config|
   config.order = :random
-  config.include ShutupHelper
+  config.include(Test::Helper::Shutup)
 end
diff --git a/Library/Homebrew/cask/spec/support/shutup_helper.rb b/Library/Homebrew/cask/spec/support/shutup_helper.rb
deleted file mode 100644
index 98dde01a6..000000000
--- a/Library/Homebrew/cask/spec/support/shutup_helper.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-module ShutupHelper
-  def shutup
-    if ENV.key?("VERBOSE_TESTS")
-      yield
-    else
-      begin
-        tmperr = $stderr.clone
-        tmpout = $stdout.clone
-        $stderr.reopen "/dev/null", "w"
-        $stdout.reopen "/dev/null", "w"
-        yield
-      ensure
-        $stderr.reopen tmperr
-        $stdout.reopen tmpout
-      end
-    end
-  end
-end
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index 528ca69cf..fdbd8af0e 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -23,23 +23,8 @@ $LOAD_PATH.push(project_root.join("lib").to_s)
 ENV["HOMEBREW_NO_EMOJI"] = "1"
 ENV["HOMEBREW_CASK_OPTS"] = nil
 
-# TODO: temporary, copied from old Homebrew, this method is now moved inside a class
-def shutup
-  if ENV.key?("VERBOSE_TESTS")
-    yield
-  else
-    begin
-      tmperr = $stderr.clone
-      tmpout = $stdout.clone
-      $stderr.reopen "/dev/null", "w"
-      $stdout.reopen "/dev/null", "w"
-      yield
-    ensure
-      $stderr.reopen tmperr
-      $stdout.reopen tmpout
-    end
-  end
-end
+require "test/helper/shutup"
+include Test::Helper::Shutup
 
 def sudo(*args)
   %w[/usr/bin/sudo -E --] + Array(args).flatten
diff --git a/Library/Homebrew/test/helper/shutup.rb b/Library/Homebrew/test/helper/shutup.rb
new file mode 100644
index 000000000..fa5f08d31
--- /dev/null
+++ b/Library/Homebrew/test/helper/shutup.rb
@@ -0,0 +1,24 @@
+module Test
+  module Helper
+    module Shutup
+      def shutup
+        if ENV.key?("VERBOSE_TESTS")
+          yield
+        else
+          begin
+            tmperr = $stderr.clone
+            tmpout = $stdout.clone
+            $stderr.reopen("/dev/null")
+            $stdout.reopen("/dev/null")
+            yield
+          ensure
+            $stderr.reopen(tmperr)
+            $stdout.reopen(tmpout)
+            tmperr.close
+            tmpout.close
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index e5ce1851e..5d464b8cc 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -63,6 +63,9 @@ module Homebrew
   end
 
   class TestCase < ::Minitest::Test
+    require "test/helper/shutup"
+    include Test::Helper::Shutup
+
     include VersionAssertions
     include FSLeakLogger
 
@@ -73,22 +76,6 @@ module Homebrew
       @_f = Class.new(Formula, &block).new(name, path, spec)
     end
 
-    def shutup
-      err = $stderr.dup
-      out = $stdout.dup
-
-      begin
-        $stderr.reopen("/dev/null")
-        $stdout.reopen("/dev/null")
-        yield
-      ensure
-        $stderr.reopen(err)
-        $stdout.reopen(out)
-        err.close
-        out.close
-      end
-    end
-
     def mktmpdir(prefix_suffix = nil, &block)
       Dir.mktmpdir(prefix_suffix, HOMEBREW_TEMP, &block)
     end