aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-03-15 19:26:58 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-03-15 19:52:41 -0700
commit2a50eabf4576580dff9b43c3d830cd78e8fbb353 (patch)
tree0118c1be1cdc1d0eaf21977ce93998f02d197124 /actionpack/test/dispatch
parentdcf1441c0f8c405b1d44cce2e0fbf86a2396dcf1 (diff)
downloadrails-2a50eabf4576580dff9b43c3d830cd78e8fbb353.tar.gz
rails-2a50eabf4576580dff9b43c3d830cd78e8fbb353.tar.bz2
rails-2a50eabf4576580dff9b43c3d830cd78e8fbb353.zip
Integration test url options should account for :protocol not just https?
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/url_generation_test.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index 18b5b7ee00..b863e37a33 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -34,5 +34,10 @@ module TestUrlGeneration
get "/foo", {}, 'SCRIPT_NAME' => "/new"
assert_equal "/new/foo", response.body
end
+
+ test "handling http protocol with https set" do
+ https!
+ assert_equal "http://www.example.com/bar/foo", foo_url(:protocol => "http")
+ end
end
-end \ No newline at end of file
+end