aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/rack_test.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-02-02 09:54:23 -0800
committerYehuda Katz <wycats@gmail.com>2009-02-02 09:54:23 -0800
commit44cdf0c5fe080d470429ab0640af25e927244907 (patch)
tree0dcaa131da49eaeb0e056d0b4cc03673bf5af4c2 /actionpack/test/dispatch/rack_test.rb
parent3030bc90c95e335d726f06fd7a61ed96055e9109 (diff)
downloadrails-44cdf0c5fe080d470429ab0640af25e927244907.tar.gz
rails-44cdf0c5fe080d470429ab0640af25e927244907.tar.bz2
rails-44cdf0c5fe080d470429ab0640af25e927244907.zip
Some merge cleanup
Diffstat (limited to 'actionpack/test/dispatch/rack_test.rb')
-rw-r--r--actionpack/test/dispatch/rack_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/rack_test.rb b/actionpack/test/dispatch/rack_test.rb
index a9a9f815da..92e6f163b2 100644
--- a/actionpack/test/dispatch/rack_test.rb
+++ b/actionpack/test/dispatch/rack_test.rb
@@ -62,7 +62,7 @@ end
class RackRequestTest < BaseRackTest
test "proxy request" do
- assert_equal 'glu.ttono.us', @request.host_with_port(true)
+ assert_equal 'glu.ttono.us', @request.host_with_port
end
test "http host" do