aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-03-07 01:07:54 +0000
committerJamis Buck <jamis@37signals.com>2006-03-07 01:07:54 +0000
commit1c0163e50c789a01d9e96aecf2014e28aa9fef51 (patch)
treef02bc116f21405a89f65befa9c6a8f11cb5425ff /actionpack/lib
parent2383a60443244dedd4b8708a2ecac922dcffc786 (diff)
downloadrails-1c0163e50c789a01d9e96aecf2014e28aa9fef51.tar.gz
rails-1c0163e50c789a01d9e96aecf2014e28aa9fef51.tar.bz2
rails-1c0163e50c789a01d9e96aecf2014e28aa9fef51.zip
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
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/integration_test.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration_test.rb b/actionpack/lib/action_controller/integration_test.rb
index 35fec04dd3..088992e13f 100644
--- a/actionpack/lib/action_controller/integration_test.rb
+++ b/actionpack/lib/action_controller/integration_test.rb
@@ -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