aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-06 22:29:29 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-06 22:29:29 -0500
commitc531bd66651639c25cc8d1b90dd6b56e5db3581b (patch)
tree4a5e4501af6927a0f863c90768600c9b28f4d724 /actionpack/lib/action_controller
parentab8aac09d654c710d8bf4b6410c60ea98e5fd5dc (diff)
downloadrails-c531bd66651639c25cc8d1b90dd6b56e5db3581b.tar.gz
rails-c531bd66651639c25cc8d1b90dd6b56e5db3581b.tar.bz2
rails-c531bd66651639c25cc8d1b90dd6b56e5db3581b.zip
Cleanup hacky routing with controller_path in url helper tests. This doesn't work in real life anyway.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/testing/process.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index 5fb244e3eb..2fccf01040 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -133,7 +133,7 @@ module ActionController #:nodoc:
@request.env['REQUEST_METHOD'] = http_method
parameters ||= {}
- @request.assign_parameters(@controller.class.controller_path, action.to_s, parameters)
+ @request.assign_parameters(@controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters)
@request.session = ActionController::TestSession.new(session) unless session.nil?
@request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash