mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
A few minor tweaks to the integration testing stuff
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3805 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
2383a60443
commit
1c0163e50c
1 changed files with 5 additions and 1 deletions
|
@ -93,6 +93,10 @@ module ActionController
|
|||
@host
|
||||
end
|
||||
|
||||
# To make setting the host more natural when using a session object
|
||||
# directly: foo.host = "blah"
|
||||
alias_method :host=, :host!
|
||||
|
||||
# Follow a single redirect response. If the last response was not a
|
||||
# redirect, an exception will be raised. Otherwise, the redirect is
|
||||
# performed on the location header.
|
||||
|
@ -173,7 +177,7 @@ module ActionController
|
|||
def interpret_uri(path)
|
||||
location = URI.parse(path)
|
||||
https! URI::HTTPS === location
|
||||
host! location.host
|
||||
host! location.host if location.host
|
||||
location.query ? "#{location.path}?#{location.query}" : location.path
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue