1 files changed, 8 insertions, 7 deletions
diff --git a/test/cgi/test_cgi_tag_helper.rb b/test/cgi/test_cgi_tag_helper.rb
index eb3c20a02e..cc119cb1bc 100644
--- a/test/cgi/test_cgi_tag_helper.rb
+++ b/test/cgi/test_cgi_tag_helper.rb
@@ -1,12 +1,15 @@
 require 'test/unit'
 require 'cgi'
 require 'stringio'
+require_relative 'update_env'
 
 
 class CGITagHelperTest < Test::Unit::TestCase
+  include UpdateEnv
 
 
   def setup
+    @environ = {}
     #@environ = {
     #  'SERVER_PROTOCOL' => 'HTTP/1.1',
     #  'REQUEST_METHOD'  => 'GET',
@@ -17,16 +20,15 @@ class CGITagHelperTest < Test::Unit::TestCase
 
 
   def teardown
-    @environ.each do |key, val| ENV.delete(key) end
+    ENV.update(@environ)
     $stdout = STDOUT
   end
 
 
   def test_cgi_tag_helper_html3
-    @environ = {
+    update_env(
       'REQUEST_METHOD' => 'GET',
-    }
-    ENV.update(@environ)
+    )
     ## html3
     cgi = CGI.new('html3')
     assert_equal('<A HREF=""></A>',cgi.a)
@@ -337,10 +339,9 @@ class CGITagHelperTest < Test::Unit::TestCase
 =end
 
   def test_cgi_tag_helper_html5
-    @environ = {
+    update_env(
       'REQUEST_METHOD' => 'GET',
-    }
-    ENV.update(@environ)
+    )
     ## html5
     cgi = CGI.new('html5')
     assert_equal('<HEADER></HEADER>',cgi.header)