diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-05-22 22:59:56 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-05-22 22:59:56 +0000 |
| commit | 6ce3bf70a24c69d8e35e8ab84dfc823042172d91 (patch) | |
| tree | b6a74e5867d2f7a9f26878e11f632e6e9bea9569 /actionpack/lib | |
| parent | 3de8239a7c93aed5883aaa00e36086b0c3e1572f (diff) | |
| download | rails-6ce3bf70a24c69d8e35e8ab84dfc823042172d91.tar.gz rails-6ce3bf70a24c69d8e35e8ab84dfc823042172d91.tar.bz2 rails-6ce3bf70a24c69d8e35e8ab84dfc823042172d91.zip | |
follow_redirect doesn't complain about being redirected to the same controller. Closes #5153.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4361 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index b35439249d..c13fe82328 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -374,8 +374,9 @@ module ActionController #:nodoc: alias xhr :xml_http_request def follow_redirect - if @response.redirected_to[:controller] - raise "Can't follow redirects outside of current controller (#{@response.redirected_to[:controller]})" + redirected_controller = @response.redirected_to[:controller] + if redirected_controller && redirected_controller != @controller.controller_name + raise "Can't follow redirects outside of current controller (from #{@controller.controller_name} to #{redirected_controller})" end get(@response.redirected_to.delete(:action), @response.redirected_to.stringify_keys) |