diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-15 19:26:58 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-15 19:52:41 -0700 |
| commit | 2a50eabf4576580dff9b43c3d830cd78e8fbb353 (patch) | |
| tree | 0118c1be1cdc1d0eaf21977ce93998f02d197124 /actionpack/lib/action_dispatch | |
| parent | dcf1441c0f8c405b1d44cce2e0fbf86a2396dcf1 (diff) | |
| download | rails-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/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 0aff4250c1..31067e56b4 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -177,14 +177,8 @@ module ActionDispatch reset! end - def url_options - opts = super.reverse_merge( - :host => host, - :protocol => https? ? "https" : "http" - ) - - opts.merge!(:port => 443) if !opts.key?(:port) && https? - opts + def default_url_options + { :host => host, :protocol => https? ? "https" : "http" } end # Resets the instance. This can be used to reset the state information |