diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-26 17:43:26 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-26 17:43:26 -0300 |
| commit | db23e321413aedcfb30207da80bfe06a0eb90e8b (patch) | |
| tree | f25aa1e6fb750544a5cfdca0c62eedcad444f4a9 /actionpack/lib | |
| parent | 29f13beda35e30b472c6617fcf3fc5cc22d3468a (diff) | |
| download | rails-db23e321413aedcfb30207da80bfe06a0eb90e8b.tar.gz rails-db23e321413aedcfb30207da80bfe06a0eb90e8b.tar.bz2 rails-db23e321413aedcfb30207da80bfe06a0eb90e8b.zip | |
Not need to do this double ternary
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 404b6185c2..41729beefb 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 ? port : (https? ? "443" : "80")), + "SERVER_PORT" => port || https? ? "443" : "80", "HTTPS" => https? ? "on" : "off", "rack.url_scheme" => https? ? "https" : "http", |