aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/test/support
diff options
context:
space:
mode:
authorAlyssa Ross2017-01-23 12:26:34 +0000
committerAlyssa Ross2017-01-23 13:39:33 +0000
commit62a0c3a6f5cd6577cf9e628524b88b91b9419df7 (patch)
tree7949a30332a7516cd8414937ab0a750db6dd5206 /Library/Homebrew/test/support
parentb7dc56a8aa08e5783072ac728ed08ca597262835 (diff)
downloadbrew-62a0c3a6f5cd6577cf9e628524b88b91b9419df7.tar.bz2
tests: remove env helper
Diffstat (limited to 'Library/Homebrew/test/support')
-rw-r--r--Library/Homebrew/test/support/helper/env.rb21
-rw-r--r--Library/Homebrew/test/support/helper/test_case.rb6
2 files changed, 2 insertions, 25 deletions
diff --git a/Library/Homebrew/test/support/helper/env.rb b/Library/Homebrew/test/support/helper/env.rb
deleted file mode 100644
index 88b25e237..000000000
--- a/Library/Homebrew/test/support/helper/env.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-module Test
- module Helper
- module Env
- def copy_env
- ENV.to_hash
- end
-
- def restore_env(env)
- ENV.replace(env)
- end
-
- def with_environment(partial_env)
- old = copy_env
- ENV.update partial_env
- yield
- ensure
- restore_env old
- end
- end
- end
-end
diff --git a/Library/Homebrew/test/support/helper/test_case.rb b/Library/Homebrew/test/support/helper/test_case.rb
index 801fa08c7..ab97ef758 100644
--- a/Library/Homebrew/test/support/helper/test_case.rb
+++ b/Library/Homebrew/test/support/helper/test_case.rb
@@ -1,11 +1,9 @@
module Homebrew
class TestCase < ::Minitest::Test
- require "test/support/helper/env"
require "test/support/helper/fs_leak_logger"
require "test/support/helper/lifecycle_enforcer"
require "test/support/helper/shutup"
require "test/support/helper/version_assertions"
- include Test::Helper::Env
include Test::Helper::FSLeakLogger
include Test::Helper::LifecycleEnforcer
include Test::Helper::Shutup
@@ -18,12 +16,12 @@ module Homebrew
super
@__argv = ARGV.dup
- @__env = copy_env
+ @__env = ENV.to_hash # dup doesn't work on ENV
end
def teardown
ARGV.replace(@__argv)
- restore_env @__env
+ ENV.replace(@__env)
Tab.clear_cache