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_controller/test_case.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_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 0fa2a8b90c..64d9bdab2a 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -336,7 +336,7 @@ module ActionController private def build_request_uri(action, parameters) unless @request.env['REQUEST_URI'] - options = @controller.__send__(:merge_options, parameters) + options = @controller.__send__(:url_options).merge(parameters) options.update(:only_path => true, :action => action) url = ActionController::UrlRewriter.new(@request, parameters) |