Merge pull request #766 from nobu/bug/env-leak

Fixed inadvertent environment variable changes

Author: aycabta

test/rdoc/test_rdoc_markdown.rb

@@ -8,6 +8,8 @@
 class TestRDocMarkdown < RDoc::TestCase
 
   def setup
+    super
+
     @RM = RDoc::Markup
 
     @parser = RDoc::Markdown.new

test/rdoc/test_rdoc_parser_changelog.rb

@@ -14,6 +14,8 @@ def setup
 
   def teardown
     @tempfile.close!
+
+    super
   end
 
   def test_class_can_parse

test/rdoc/test_rdoc_ri_driver.rb

@@ -13,7 +13,6 @@ def setup
     FileUtils.mkdir_p @home_ri
 
     @orig_ri = ENV['RI']
-    @orig_home = ENV['HOME']
     ENV['HOME'] = @tmpdir
     @rdoc_home = File.join ENV["HOME"], ".rdoc"
     FileUtils.mkdir_p @rdoc_home
@@ -33,11 +32,10 @@ def setup
   end
 
   def teardown
-    super
-
-    ENV['HOME'] = @orig_home
     ENV['RI'] = @orig_ri
     FileUtils.rm_rf @tmpdir
+
+    super
   end
 
   DUMMY_PAGER = ":;\n"

test/rdoc/test_rdoc_ri_paths.rb

@@ -36,12 +36,12 @@ def setup
   end
 
   def teardown
-    super
-
     Gem.use_paths(*@orig_gem_path)
     Gem::Specification.reset
     FileUtils.rm_rf @tempdir
     ENV.replace(@orig_env)
+
+    super
   end
 
   def test_class_each