Tweak use of with_env

- Use it in more places where it saves code
- Allow using symbolic keys for a cleaner interface
- Use `HOMEBREW_GEM_*` instead of `GEM_OLD_*`

1 files changed, 3 insertions, 3 deletions

diff --git a/Library/Homebrew/test/utils_spec.rb b/Library/Homebrew/test/utils_spec.rb
index 0c2ae5161..037a80b64 100644
--- a/Library/Homebrew/test/utils_spec.rb
+++ b/Library/Homebrew/test/utils_spec.rb
@@ -274,13 +274,13 @@ describe "globally-scoped helper methods" do
   describe "#with_env" do
     it "sets environment variables within the block" do
       expect(ENV["PATH"]).not_to eq("/bin")
-      with_env "PATH" => "/bin" do
+      with_env(PATH: "/bin") do
         expect(ENV["PATH"]).to eq("/bin")
       end
     end
 
     it "restores ENV after the block" do
-      with_env "PATH" => "/bin" do
+      with_env(PATH: "/bin") do
         expect(ENV["PATH"]).to eq("/bin")
       end
       expect(ENV["PATH"]).not_to eq("/bin")
@@ -288,7 +288,7 @@ describe "globally-scoped helper methods" do
 
     it "restores ENV if an exception is raised" do
       expect {
-        with_env "PATH" => "/bin" do
+        with_env(PATH: "/bin") do
           raise StandardError, "boom"
         end
       }.to raise_error(StandardError)