aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-04-30 08:34:02 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-04-30 08:34:02 +0000
commitb4fe4daa840741dce464b3c9ff5a7e447375bdd5 (patch)
tree72384d46ec3069b98358236cccb645d5939c75b7 /actionpack/lib
parentc29cfe389e5ba27e75d05a23823ebe7abe22e9d0 (diff)
downloadrails-b4fe4daa840741dce464b3c9ff5a7e447375bdd5.tar.gz
rails-b4fe4daa840741dce464b3c9ff5a7e447375bdd5.tar.bz2
rails-b4fe4daa840741dce464b3c9ff5a7e447375bdd5.zip
Fixed assert_redirected_to to work with :only_path => false #1204 [Alisdair McDiarmid]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1251 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/assertions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb
index e46e868ff5..00388f8f59 100644
--- a/actionpack/lib/action_controller/assertions.rb
+++ b/actionpack/lib/action_controller/assertions.rb
@@ -57,7 +57,7 @@ module Test #:nodoc:
@response.redirected_to == options
else
options.keys.all? do |k|
- options[k] == (@response.redirected_to[k].respond_to?(:to_param) ? @response.redirected_to[k].to_param : @response.redirected_to[k] if @response.redirected_to[k])
+ options[k] == (@response.redirected_to[k].respond_to?(:to_param) ? @response.redirected_to[k].to_param : @response.redirected_to[k] unless @response.redirected_to[k].nil?)
end
end
end