From 226dfc2681c98deaf14e4ae82e973d1d5caedd68 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Wed, 24 Feb 2010 16:01:03 -0800
Subject: WIP: Remove the global router

---
 actionpack/test/dispatch/routing_test.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'actionpack/test/dispatch')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index e29127f78f..7cfc6ef3d7 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -164,6 +164,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     Routes
   end
 
+  include Routes.named_url_helpers
+
   def test_logout
     with_test_routes do
       delete '/logout'
@@ -728,14 +730,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
   private
     def with_test_routes
-      real_routes, temp_routes = ActionDispatch::Routing::Routes, Routes
-
-      ActionDispatch::Routing.module_eval { remove_const :Routes }
-      ActionDispatch::Routing.module_eval { const_set :Routes, temp_routes }
-
       yield
-    ensure
-      ActionDispatch::Routing.module_eval { remove_const :Routes }
-      ActionDispatch::Routing.const_set(:Routes, real_routes)
     end
 end
-- 
cgit v1.2.3