diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-06-03 18:12:56 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-06-03 18:12:56 -0500 |
| commit | 885453537e550489f825356ec4404d384893126a (patch) | |
| tree | 215184057efd4202059b8512bcbcd159962ff9a4 /actionpack/lib | |
| parent | edfa195e2ace7b4fb8195333c6e44e6bf8986c11 (diff) | |
| parent | 025515b234d8380f195e3de3818d076302605b12 (diff) | |
| download | rails-885453537e550489f825356ec4404d384893126a.tar.gz rails-885453537e550489f825356ec4404d384893126a.tar.bz2 rails-885453537e550489f825356ec4404d384893126a.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index c5fc6c7966..3deda0b45a 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -97,7 +97,7 @@ module ActionController value['controller'] = value['controller'].to_s if key == :actual && value['controller'].first != '/' && !value['controller'].include?('/') new_controller_path = ActionController::Routing.controller_relative_to(value['controller'], @controller.class.controller_path) - value['controller'] = new_controller_path if value['controller'] != new_controller_path && ActionController::Routing.possible_controllers.include?(new_controller_path) + value['controller'] = new_controller_path if value['controller'] != new_controller_path && ActionController::Routing.possible_controllers.include?(new_controller_path) && @response.redirected_to.is_a?(Hash) end value['controller'] = value['controller'][1..-1] if value['controller'].first == '/' # strip leading hash end |