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

5 files changed, 22 insertions, 3 deletions

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