diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-06 18:12:13 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-05-06 18:12:13 -0700 |
| commit | 8d85baa0e317c5baa3b8671d7fdd79e36f7058c7 (patch) | |
| tree | fe0ccd0fce8b71e597c7ca6da980ca1148095427 /actionpack | |
| parent | 0f97ac66471270b917103869a56bc409aa3ccf0b (diff) | |
| parent | a145955fb7a7c3963453733b3fbac8a2c12a45d7 (diff) | |
| download | rails-8d85baa0e317c5baa3b8671d7fdd79e36f7058c7.tar.gz rails-8d85baa0e317c5baa3b8671d7fdd79e36f7058c7.tar.bz2 rails-8d85baa0e317c5baa3b8671d7fdd79e36f7058c7.zip | |
Merge pull request #10478 from cainlevy/patch-1
use canonical #controller_path logic in controller test cases
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
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 41a286f0ed..e5f1ad63c2 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -558,7 +558,7 @@ module ActionController parameters ||= {} controller_class_name = @controller.class.anonymous? ? "anonymous" : - @controller.class.name.underscore.sub(/_controller$/, '') + @controller.class.controller_path @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters) |