aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.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/lib/action_controller/test_case.rb
parent4cdfe98d925397a613c9220bca65be5081c92f56 (diff)
downloadrails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.gz
rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.tar.bz2
rails-6bc24d40d56332593bc22612d4618a2f80b1d91b.zip
Use ActionDispatch::Routing everywhere
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 14557ca782..99924205dd 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -19,7 +19,7 @@ module ActionController
def assign_parameters(controller_path, action, parameters = {})
parameters = parameters.symbolize_keys.merge(:controller => controller_path, :action => action)
- extra_keys = ActionController::Routing::Routes.extra_keys(parameters)
+ extra_keys = ActionDispatch::Routing::Routes.extra_keys(parameters)
non_path_parameters = get? ? query_parameters : request_parameters
parameters.each do |key, value|
if value.is_a? Fixnum