diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:20:41 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-26 15:20:41 -0800 |
| commit | bae691f61ab8cf4a59adaee6406855e11d009c74 (patch) | |
| tree | 30dbf62a2f8cce56498fc8d92b35a2d5ff0a66a8 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | 224c0318bdbaea354bc5ab5c70b267b2a9c3d1c9 (diff) | |
| download | rails-bae691f61ab8cf4a59adaee6406855e11d009c74.tar.gz rails-bae691f61ab8cf4a59adaee6406855e11d009c74.tar.bz2 rails-bae691f61ab8cf4a59adaee6406855e11d009c74.zip | |
Change the API for setting global options for #url_for to self.url_options = { ... }
This attr_accessor can be set in a before filter or in the action itself.
Overwriting default_url_options still works but will output a deprecation notice.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -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 fb067601c8..0bad9c37d6 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -357,7 +357,7 @@ module ActionDispatch extend ActiveSupport::Concern include ActionDispatch::Routing::UrlFor - def merge_options(options) + def url_options opts = super.reverse_merge( :host => host, :protocol => https? ? "https" : "http" |