3 files changed, 26 insertions, 13 deletions
diff --git a/railties/lib/rails/generators/test_case.rb b/railties/lib/rails/generators/test_case.rb
index ff9cf0087e..2ff340755a 100644
--- a/railties/lib/rails/generators/test_case.rb
+++ b/railties/lib/rails/generators/test_case.rb
@@ -37,8 +37,16 @@ module Rails
       self.current_path = File.expand_path(Dir.pwd)
       self.default_arguments = []
 
-      setup :destination_root_is_set?, :ensure_current_path
-      teardown :ensure_current_path
+      def setup
+        destination_root_is_set?
+        ensure_current_path
+        super
+      end
+
+      def teardown
+        ensure_current_path
+        super
+      end
 
       # Sets which generator should be tested:
       #
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 03be81e59f..50ee68032f 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -19,15 +19,18 @@ RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
 # to run the tests
 require "active_support/testing/isolation"
 require "active_support/core_ext/kernel/reporting"
+require 'tmpdir'
 
 module TestHelpers
   module Paths
     module_function
 
-    TMP_PATH = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. tmp]))
+    def app_template_path
+      File.join Dir.tmpdir, 'app_template'
+    end
 
     def tmp_path(*args)
-      File.join(TMP_PATH, *args)
+      @tmp_path ||= Dir.mktmpdir
     end
 
     def app_path(*args)
@@ -95,7 +98,7 @@ module TestHelpers
       ENV['RAILS_ENV'] = 'development'
 
       FileUtils.rm_rf(app_path)
-      FileUtils.cp_r(tmp_path('app_template'), app_path)
+      FileUtils.cp_r(app_template_path, app_path)
 
       # Delete the initializers unless requested
       unless options[:initializers]
@@ -272,18 +275,18 @@ end
 Module.new do
   extend TestHelpers::Paths
   # Build a rails app
-  if File.exist?(tmp_path)
-    FileUtils.rm_rf(tmp_path)
+  if File.exist?(app_template_path)
+    FileUtils.rm_rf(app_template_path)
   end
-  FileUtils.mkdir(tmp_path)
+  FileUtils.mkdir(app_template_path)
 
   environment = File.expand_path('../../../../load_paths', __FILE__)
   if File.exist?("#{environment}.rb")
     require_environment = "-r #{environment}"
   end
 
-  `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{tmp_path('app_template')}`
-  File.open("#{tmp_path}/app_template/config/boot.rb", 'w') do |f|
+  `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/bin/rails new #{app_template_path}`
+  File.open("#{app_template_path}/config/boot.rb", 'w') do |f|
     if require_environment
       f.puts "Dir.chdir('#{File.dirname(environment)}') do"
       f.puts "  require '#{environment}'"
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
index 6ebbabc0ff..4e2bb1e6b7 100644
--- a/railties/test/railties/generators_test.rb
+++ b/railties/test/railties/generators_test.rb
@@ -8,11 +8,13 @@ module RailtiesTests
   class GeneratorTest < Rails::Generators::TestCase
     include ActiveSupport::Testing::Isolation
 
-    TMP_PATH = File.expand_path(File.join(File.dirname(__FILE__), *%w[.. .. tmp]))
-    self.destination_root = File.join(TMP_PATH, "foo_bar")
+    def destination_root
+      tmp_path 'foo_bar'
+    end
 
     def tmp_path(*args)
-      File.join(TMP_PATH, *args)
+      @tmp_path ||= Dir.mktmpdir
+      File.join(@tmp_path, *args)
     end
 
     def engine_path