diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-02 18:16:38 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-07-02 18:16:38 +0000 |
| commit | 177ed3e6816bb655a0aca6a99df5a456efd96e10 (patch) | |
| tree | 6c0bf797a17cd92dedf3e134ca5a55e31afa1efe /actionpack/lib/action_controller | |
| parent | eb2b86d795817ad342be7d2a19e9f5cc7390ab2d (diff) | |
| download | rails-177ed3e6816bb655a0aca6a99df5a456efd96e10.tar.gz rails-177ed3e6816bb655a0aca6a99df5a456efd96e10.tar.bz2 rails-177ed3e6816bb655a0aca6a99df5a456efd96e10.zip | |
Added more tests on assert_redirected_to #1581 [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1609 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/assertions.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/assertions.rb b/actionpack/lib/action_controller/assertions.rb index c8245c7a3a..64b47c94da 100644 --- a/actionpack/lib/action_controller/assertions.rb +++ b/actionpack/lib/action_controller/assertions.rb @@ -56,11 +56,10 @@ module Test #:nodoc: # such at assert_redirected_to(:controller => "weblog") will also match the redirection of # redirect_to(:controller => "weblog", :action => "show") and so on. def assert_redirected_to(options = {}, message=nil) - assert_redirect(message) + assert_response(:redirect, message) if options.is_a?(String) msg = build_message(message, "expected a redirect to <?>, found one to <?>", options, @response.redirect_url) - url_regexp = %r{^(\w+://.*?(/|$|\?))(.*)$} eurl, epath, url, path = [options, @response.redirect_url].collect do |url| u, p = (url_regexp =~ url) ? [$1, $3] : [nil, url] |