aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/routing_test.rb
diff options
context:
space:
mode:
authorMartin Schürrer <martin@schuerrer.org>2010-02-21 17:21:25 +0100
committerYehuda Katz <yehudakatz@YK.local>2010-02-21 13:43:51 -0800
commit6bc24d40d56332593bc22612d4618a2f80b1d91b (patch)
treee49938db28fe51f5c45efde3dec5793e65694da0 /actionpack/test/dispatch/routing_test.rb
parent4cdfe98d925397a613c9220bca65be5081c92f56 (diff)
downloadrails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.gz
rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.bz2
rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.zip
Use ActionDispatch::Routing everywhere
Diffstat (limited to 'actionpack/test/dispatch/routing_test.rb')
-rw-r--r--actionpack/test/dispatch/routing_test.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 0cd1fddff1..e29127f78f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -728,14 +728,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
private
def with_test_routes
- real_routes, temp_routes = ActionController::Routing::Routes, Routes
+ real_routes, temp_routes = ActionDispatch::Routing::Routes, Routes
- ActionController::Routing.module_eval { remove_const :Routes }
- ActionController::Routing.module_eval { const_set :Routes, temp_routes }
+ ActionDispatch::Routing.module_eval { remove_const :Routes }
+ ActionDispatch::Routing.module_eval { const_set :Routes, temp_routes }
yield
ensure
- ActionController::Routing.module_eval { remove_const :Routes }
- ActionController::Routing.const_set(:Routes, real_routes)
+ ActionDispatch::Routing.module_eval { remove_const :Routes }
+ ActionDispatch::Routing.const_set(:Routes, real_routes)
end
end