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
This commit is contained in:
parent
c29cfe389e
commit
b4fe4daa84
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Fixed assert_redirected_to to work with :only_path => false #1204 [Alisdair McDiarmid]
|
||||
|
||||
* Fixed render_partial_collection to output an empty string instead of nil when handed an empty array #1202 [Ryan Carver]
|
||||
|
||||
* Improved the speed of regular expression expirations for caching by a factor of 10 #1221 [Jamis Buck]
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -9,6 +9,10 @@ class RedirectController < ActionController::Base
|
|||
redirect_to :dashbord_url, 1, "hello"
|
||||
end
|
||||
|
||||
def host_redirect
|
||||
redirect_to :action => "other_host", :only_path => false, :host => 'other.test.host'
|
||||
end
|
||||
|
||||
def rescue_errors(e) raise e end
|
||||
|
||||
protected
|
||||
|
@ -33,4 +37,9 @@ class RedirectTest < Test::Unit::TestCase
|
|||
get :method_redirect
|
||||
assert_redirect_url "http://test.host/redirect/dashboard/1?message=hello"
|
||||
end
|
||||
end
|
||||
|
||||
def test_simple_redirect_using_options
|
||||
get :host_redirect
|
||||
assert_redirected_to :action => "other_host", :only_path => false, :host => 'other.test.host'
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue