From 05c29680e515c000552008f725747261ffa6008d Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 12 Mar 2015 14:57:33 +0000 Subject: fix env leaks * lib/rubygems/test_case.rb (setup, teardown): fix environment variable change leaks. * test/cgi/update_env.rb: ditto. * test/rake/test_rake_application_options.rb (setup, teardown): ditto. * test/rake/test_rake_file_utils.rb (setup, teardown): ditto. * test/rubygems/test_gem_request.rb (setup): add https_proxy. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/cgi/test_cgi_cookie.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'test/cgi/test_cgi_cookie.rb') diff --git a/test/cgi/test_cgi_cookie.rb b/test/cgi/test_cgi_cookie.rb index c1c6a30e70..eaf4ff1aa9 100644 --- a/test/cgi/test_cgi_cookie.rb +++ b/test/cgi/test_cgi_cookie.rb @@ -1,21 +1,25 @@ require 'test/unit' require 'cgi' require 'stringio' +require_relative 'update_env' class CGICookieTest < Test::Unit::TestCase + include UpdateEnv def setup - ENV['REQUEST_METHOD'] = 'GET' + @environ = {} + update_env( + 'REQUEST_METHOD' => 'GET', + 'SCRIPT_NAME' => nil, + ) @str1="\xE3\x82\x86\xE3\x82\x93\xE3\x82\x86\xE3\x82\x93" @str1.force_encoding("UTF-8") if defined?(::Encoding) end def teardown - %W[REQUEST_METHOD SCRIPT_NAME].each do |name| - ENV.delete(name) - end + ENV.update(@environ) end -- cgit v1.2.3