diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-26 17:54:00 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-26 17:54:00 -0300 |
| commit | 56de4e9a8090e2e617a0d478d38c0fccfce7d725 (patch) | |
| tree | 3609c662905abe1cf74562ef56f184b02c0d268e /actionpack/lib | |
| parent | db23e321413aedcfb30207da80bfe06a0eb90e8b (diff) | |
| download | rails-56de4e9a8090e2e617a0d478d38c0fccfce7d725.tar.gz rails-56de4e9a8090e2e617a0d478d38c0fccfce7d725.tar.bz2 rails-56de4e9a8090e2e617a0d478d38c0fccfce7d725.zip | |
Fix the precedence issue here
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 41729beefb..50bdad1b1c 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -264,7 +264,7 @@ module ActionDispatch :params => parameters, "SERVER_NAME" => hostname, - "SERVER_PORT" => port || https? ? "443" : "80", + "SERVER_PORT" => port || (https? ? "443" : "80"), "HTTPS" => https? ? "on" : "off", "rack.url_scheme" => https? ? "https" : "http", |