Solve the RAILS_ENV problem in the railties tests in a more generic way

31 files changed, 117 insertions, 22 deletions

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 98a702f134..2b593005a2 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -11,6 +11,10 @@ module ApplicationTests
       boot_rails
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app
       @app ||= Rails.application
     end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 0e27c9606d..e2c996364f 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -35,6 +35,10 @@ module ApplicationTests
     end
 
     def teardown
+      teardown_app
+    end
+
+    def teardown
       FileUtils.rm_rf(new_app) if File.directory?(new_app)
     end
 
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index 91e2c2480e..1528d5dd87 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -1,17 +1,15 @@
 require 'isolation/abstract_unit'
 
 class ConsoleTest < Test::Unit::TestCase
-  include ActiveSupport::Testing::Isolation  
+  include ActiveSupport::Testing::Isolation
 
   def setup
-    @prev_rails_env = ENV['RAILS_ENV']
-    ENV['RAILS_ENV'] = 'development'
     build_app
     boot_rails
   end
 
   def teardown
-    ENV['RAILS_ENV'] = @prev_rails_env
+    teardown_app
   end
 
   def load_environment(sandbox = false)
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 1ca9515335..4365d00b1f 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -9,6 +9,10 @@ module ApplicationTests
       boot_rails
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app_const
       @app_const ||= Class.new(Rails::Application)
     end
diff --git a/railties/test/application/initializers/boot_test.rb b/railties/test/application/initializers/boot_test.rb
index 5ec562f12f..b1e01dc13f 100644
--- a/railties/test/application/initializers/boot_test.rb
+++ b/railties/test/application/initializers/boot_test.rb
@@ -9,8 +9,12 @@ module ApplicationTests
       # boot_rails
     end
 
+    def teardown
+      # teardown_app
+    end
+
     test "booting rails sets the load paths correctly" do
       # This test is pending reworking the boot process
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/application/initializers/check_ruby_version_test.rb b/railties/test/application/initializers/check_ruby_version_test.rb
index 5b6196307d..df7e9696a9 100644
--- a/railties/test/application/initializers/check_ruby_version_test.rb
+++ b/railties/test/application/initializers/check_ruby_version_test.rb
@@ -9,6 +9,10 @@ module ApplicationTests
       boot_rails
     end
 
+    def teardown
+      teardown_app
+    end
+
     test "rails initializes with ruby 1.8.7 or later, except for 1.9.1" do
       if RUBY_VERSION < '1.8.7'
         assert_rails_does_not_boot
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 9068bf4b1e..446c85d65a 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -5,15 +5,13 @@ module ApplicationTests
     include ActiveSupport::Testing::Isolation
 
     def setup
-      @prev_rails_env = ENV['RAILS_ENV']
-      ENV['RAILS_ENV'] = 'development'
       build_app
       boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
     def teardown
-      ENV['RAILS_ENV'] = @prev_rails_env
+      teardown_app
     end
 
     # AC & AM
diff --git a/railties/test/application/initializers/hooks_test.rb b/railties/test/application/initializers/hooks_test.rb
index 198abbe861..8c7726339c 100644
--- a/railties/test/application/initializers/hooks_test.rb
+++ b/railties/test/application/initializers/hooks_test.rb
@@ -10,6 +10,10 @@ module ApplicationTests
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
+    def teardown
+      teardown_app
+    end
+
     test "load initializers" do
       app_file "config/initializers/foo.rb", "$foo = true"
       require "#{app_path}/config/environment"
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index 390f65ab5c..aa4db6e12a 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -11,6 +11,10 @@ module ApplicationTests
       require "rails/all"
     end
 
+    def teardown
+      teardown_app
+    end
+
     def load_app
       require "#{app_path}/config/environment"
     end
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index e3d9e8e4b3..644b8208a9 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -5,15 +5,13 @@ module ApplicationTests
     include ActiveSupport::Testing::Isolation
 
     def setup
-      @prev_rails_env = ENV['RAILS_ENV']
-      ENV['RAILS_ENV'] = 'development'
       build_app
       boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
     def teardown
-      ENV['RAILS_ENV'] = @prev_rails_env
+      teardown_app
     end
 
     test "initializing an application adds the application paths to the load path" do
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index c87433db0d..b72c14eaf0 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -9,6 +9,10 @@ module ApplicationTests
       boot_rails
     end
 
+    def teardown
+      teardown_app
+    end
+
     def instrument(*args, &block)
       ActiveSupport::Notifications.instrument(*args, &block)
     end
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index 5e7e16733e..47c6fd5c6e 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -4,14 +4,12 @@ class LoadingTest < Test::Unit::TestCase
   include ActiveSupport::Testing::Isolation
 
   def setup
-    @prev_rails_env = ENV['RAILS_ENV']
-    ENV['RAILS_ENV'] = 'development'
     build_app
     boot_rails
   end
 
   def teardown
-    ENV['RAILS_ENV'] = @prev_rails_env
+    teardown_app
   end
 
   def app
diff --git a/railties/test/application/middleware/best_practices_test.rb b/railties/test/application/middleware/best_practices_test.rb
index 5b722e7510..1c88b9bf06 100644
--- a/railties/test/application/middleware/best_practices_test.rb
+++ b/railties/test/application/middleware/best_practices_test.rb
@@ -12,6 +12,10 @@ module ApplicationTests
       simple_controller
     end
 
+    def teardown
+      teardown_app
+    end
+
     test "simple controller in production mode returns best standards" do
       get '/foo'
       assert_equal "IE=Edge,chrome=1", last_response.headers["X-UA-Compatible"]
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index a8033d2b23..e656ada3c0 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -11,6 +11,10 @@ module ApplicationTests
       extend Rack::Test::Methods
     end
 
+    def teardown
+      teardown_app
+    end
+
     def simple_controller
       controller :expires, <<-RUBY
         class ExpiresController < ApplicationController
diff --git a/railties/test/application/middleware/remote_ip_test.rb b/railties/test/application/middleware/remote_ip_test.rb
index f28302d70a..da291f061c 100644
--- a/railties/test/application/middleware/remote_ip_test.rb
+++ b/railties/test/application/middleware/remote_ip_test.rb
@@ -10,6 +10,10 @@ module ApplicationTests
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app
       @app ||= Rails.application
     end
diff --git a/railties/test/application/middleware/sendfile_test.rb b/railties/test/application/middleware/sendfile_test.rb
index 0128261cd4..c7a1c573f9 100644
--- a/railties/test/application/middleware/sendfile_test.rb
+++ b/railties/test/application/middleware/sendfile_test.rb
@@ -10,6 +10,10 @@ module ApplicationTests
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app
       @app ||= Rails.application
     end
diff --git a/railties/test/application/middleware/show_exceptions_test.rb b/railties/test/application/middleware/show_exceptions_test.rb
index 5487e41e0a..e3f27f63c3 100644
--- a/railties/test/application/middleware/show_exceptions_test.rb
+++ b/railties/test/application/middleware/show_exceptions_test.rb
@@ -10,6 +10,10 @@ module ApplicationTests
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app
       @app ||= Rails.application
     end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 715798ca08..6a0a272073 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -11,6 +11,10 @@ module ApplicationTests
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app
       @app ||= Rails.application
     end
@@ -200,4 +204,4 @@ module ApplicationTests
         AppTemplate::Application.middleware.map(&:klass).map(&:name)
       end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index 03e0247556..0d22d8c19a 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -20,6 +20,10 @@ module ApplicationTests
       @paths = Rails.application.config.paths
     end
 
+    def teardown
+      teardown_app
+    end
+
     def root(*path)
       app_path(*path).to_s
     end
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb
index 715af5c642..8b2b2f1802 100644
--- a/railties/test/application/rack/logger_test.rb
+++ b/railties/test/application/rack/logger_test.rb
@@ -14,6 +14,10 @@ module ApplicationTests
         super
       end
 
+      def teardown
+        teardown_app
+      end
+
       def logs
         @logs ||= @logger.logged(:info)
       end
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index 885355fd46..ff9cdcadc7 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -11,14 +11,12 @@ module ApplicationTests
     end
 
     def setup
-      @prev_rails_env = ENV['RAILS_ENV']
-      ENV['RAILS_ENV'] = 'development'
       build_app
       boot_rails
     end
 
     def teardown
-      ENV['RAILS_ENV'] = @prev_rails_env
+      teardown_app
     end
 
     test "rails app is present" do
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index ab36ace5e5..44ac6615de 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -10,6 +10,10 @@ module ApplicationTests
       FileUtils.rm_rf("#{app_path}/config/environments")
     end
 
+    def teardown
+      teardown_app
+    end
+
     def test_gems_tasks_are_loaded_first_than_application_ones
       app_file "lib/tasks/app.rake", <<-RUBY
         $task_loaded = Rake::Task.task_defined?("db:create:all")
@@ -113,7 +117,7 @@ module ApplicationTests
       end
 
       require "#{rails_root}/config/environment"
-      
+
       # loading a specific fixture
       errormsg = Dir.chdir(app_path) { `rake db:fixtures:load FIXTURES=products` }
       assert $?.success?, errormsg
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index e3a7f8a63c..3adf0ccd3e 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -11,6 +11,10 @@ module ApplicationTests
       boot_rails
     end
 
+    def teardown
+      teardown_app
+    end
+
     test "rails/info/properties in development" do
       app("development")
       get "/rails/info/properties"
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 292d1e247f..4104bacae5 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -18,6 +18,10 @@ module ApplicationTests
       MODEL
     end
 
+    def teardown
+      teardown_app
+    end
+
     def test_should_include_runner_in_shebang_line_in_help
       assert_match "/rails runner", Dir.chdir(app_path) { `bundle exec rails runner --help` }
     end
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index f96319f472..27a7959e84 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -9,6 +9,10 @@ module ApplicationTests
       boot_rails
     end
 
+    def teardown
+      teardown_app
+    end
+
     test "truth" do
       app_file 'test/unit/foo_test.rb', <<-RUBY
         require 'test_helper'
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 69208ce4c3..c0233c5f90 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -91,6 +91,8 @@ module TestHelpers
   module Generation
     # Build an application by invoking the generator and going through the whole stack.
     def build_app(options = {})
+      @prev_rails_env = ENV.delete('RAILS_ENV')
+
       FileUtils.rm_rf(app_path)
       FileUtils.cp_r(tmp_path('app_template'), app_path)
 
@@ -115,6 +117,10 @@ module TestHelpers
       add_to_config 'config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"; config.session_store :cookie_store, :key => "_myapp_session"; config.active_support.deprecation = :log'
     end
 
+    def teardown_app
+      ENV['RAILS_ENV'] = @prev_rails_env if @prev_rails_env
+    end
+
     # Make a very basic app, without creating the whole directory structure.
     # This is faster and simpler than the method above.
     def make_basic_app
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index b5b21f9ebe..44cee2b164 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -25,6 +25,10 @@ module RailtiesTest
       end
     end
 
+    def teardown
+      teardown_app
+    end
+
     test "Rails::Engine itself does not respond to config" do
       boot_rails
       assert !Rails::Engine.respond_to?(:config)
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index 47a4753e78..b793a7401f 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -106,6 +106,10 @@ module ApplicationTests
       boot_rails
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app
       @app ||= begin
         require "#{app_path}/config/environment"
@@ -116,7 +120,7 @@ module ApplicationTests
     def reset_script_name!
       Rails.application.routes.default_url_options = {}
     end
-    
+
     def script_name(script_name)
       Rails.application.routes.default_url_options = {:script_name => script_name}
     end
@@ -171,4 +175,3 @@ module ApplicationTests
     end
   end
 end
-
diff --git a/railties/test/railties/plugin_ordering_test.rb b/railties/test/railties/plugin_ordering_test.rb
index f6ca493fdf..1cfaf557e9 100644
--- a/railties/test/railties/plugin_ordering_test.rb
+++ b/railties/test/railties/plugin_ordering_test.rb
@@ -12,6 +12,10 @@ module RailtiesTest
       plugin "c_plugin", "$arr << :c"
     end
 
+    def teardown
+      teardown_app
+    end
+
     def boot_rails
       super
       require "#{app_path}/config/environment"
@@ -69,4 +73,4 @@ module RailtiesTest
       assert $bar
     end
   end
-end
\ No newline at end of file
+end
diff --git a/railties/test/railties/plugin_test.rb b/railties/test/railties/plugin_test.rb
index c15ac05103..f307d53cf7 100644
--- a/railties/test/railties/plugin_test.rb
+++ b/railties/test/railties/plugin_test.rb
@@ -15,6 +15,10 @@ module RailtiesTest
       end
     end
 
+    def teardown
+      teardown_app
+    end
+
     test "Rails::Plugin itself does not respond to config" do
       boot_rails
       assert !Rails::Plugin.respond_to?(:config)
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index 18fdf59fe3..55f85c7202 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -11,6 +11,10 @@ module RailtiesTest
       require "rails/all"
     end
 
+    def teardown
+      teardown_app
+    end
+
     def app
       @app ||= Rails.application
     end