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 22:19:46 -0300 |
| commit | 0b35a3aacc384a9552832fdf0e5a0f71393ef2d1 (patch) | |
| tree | 3ced07fde9a46dc9e3ef9a72d208e002f159a9f4 | |
| parent | fb90ce015f5ba0919d1546a77ac65ca2c3539a74 (diff) | |
| download | rails-0b35a3aacc384a9552832fdf0e5a0f71393ef2d1.tar.gz rails-0b35a3aacc384a9552832fdf0e5a0f71393ef2d1.tar.bz2 rails-0b35a3aacc384a9552832fdf0e5a0f71393ef2d1.zip | |
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
| -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 dc58166f78..e089feea87 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -475,7 +475,7 @@ module ActionController 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) |