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

7 files changed, 23 insertions, 7 deletions

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