Cleanup route reloading in tests. Prefer with_routing over using ActionController::Routing::Routes directly

1 files changed, 10 insertions, 1 deletions

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index eb4e2fb585..b618c059a3 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -51,6 +51,10 @@ module ActionView
       ActionController::Routing::Routes.draw do |map|
         map.connect ':controller/:action/:id'
       end
+
+      teardown do
+        ActionController::Routing::Routes.reload!
+      end
     end
   end
 end
@@ -70,12 +74,17 @@ module ActionController
   
   class TestCase
     include TestProcess
+
     setup do
       ActionController::Routing::Routes.draw do |map|
         map.connect ':controller/:action/:id'
       end
     end
-    
+
+    teardown do
+      ActionController::Routing::Routes.reload!
+    end
+
     def assert_template(options = {}, message = nil)
       validate_request!