From fba00f2bbfd970ece1d2503a333a9a2730ae5b63 Mon Sep 17 00:00:00 2001
From: Josh Hagins <hagins.josh@gmail.com>
Date: Wed, 19 Oct 2016 12:32:48 -0400
Subject: [PATCH] testing_env: extract with_environment to helper module

---
 Library/Homebrew/test/helper/env.rb  | 15 +++++++++++++++
 Library/Homebrew/test/testing_env.rb | 12 ++----------
 2 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 Library/Homebrew/test/helper/env.rb

diff --git a/Library/Homebrew/test/helper/env.rb b/Library/Homebrew/test/helper/env.rb
new file mode 100644
index 0000000000..904a1d4c71
--- /dev/null
+++ b/Library/Homebrew/test/helper/env.rb
@@ -0,0 +1,15 @@
+module Test
+  module Helper
+    module Env
+      def with_environment(partial_env)
+        old = ENV.to_hash
+        ENV.update partial_env
+        begin
+          yield
+        ensure
+          ENV.replace old
+        end
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index 02264aa392..5f98ace15d 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -63,7 +63,9 @@ module Homebrew
   end
 
   class TestCase < ::Minitest::Test
+    require "test/helper/env"
     require "test/helper/shutup"
+    include Test::Helper::Env
     include Test::Helper::Shutup
 
     include VersionAssertions
@@ -112,16 +114,6 @@ module Homebrew
       Pathname.new("#{TEST_DIRECTORY}/mach/#{name}.bundle")
     end
 
-    def with_environment(partial_env)
-      old = ENV.to_hash
-      ENV.update partial_env
-      begin
-        yield
-      ensure
-        ENV.replace old
-      end
-    end
-
     # Use a stubbed {Formulary::FormulaLoader} to make a given formula be found
     # when loading from {Formulary} with `ref`.
     def stub_formula_loader(formula, ref = formula.full_name)