Skip to content
Browse files

Merge pull request #10478 from cainlevy/patch-1

use canonical #controller_path logic in controller test cases
Conflicts:
	actionpack/lib/action_controller/test_case.rb
  • Loading branch information...
1 parent fb90ce0 commit 0b35a3aacc384a9552832fdf0e5a0f71393ef2d1 @rafaelfranca rafaelfranca committed May 6, 2013
Showing with 1 addition and 1 deletion.
  1. +1 −1 actionpack/lib/action_controller/test_case.rb
View
2 actionpack/lib/action_controller/test_case.rb
@@ -475,7 +475,7 @@ def process(action, parameters = nil, session = nil, flash = nil, http_method =
parameters ||= {}
controller_class_name = @controller.class.anonymous? ?
"anonymous_controller" :
- @controller.class.name.underscore.sub(/_controller$/, '')
+ @controller.class.controller_path
@request.assign_parameters(@routes, controller_class_name, action.to_s, parameters)

0 comments on commit 0b35a3a

Please sign in to comment.
Something went wrong with that request. Please try again.