diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-02-25 15:05:10 -0800 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-02-25 17:53:01 -0800 |
| commit | 36fd9efb5e4bfc9ac3acd4189d4dc457dea8102a (patch) | |
| tree | ee50b242b16d4d4a5c98a2d48f5b0af2d46e5ce0 /actionpack/lib/action_controller/test_case.rb | |
| parent | 9a5be2e5a80ab9e74294f32cfef58fbbcd9b637c (diff) | |
| download | rails-36fd9efb5e4bfc9ac3acd4189d4dc457dea8102a.tar.gz rails-36fd9efb5e4bfc9ac3acd4189d4dc457dea8102a.tar.bz2 rails-36fd9efb5e4bfc9ac3acd4189d4dc457dea8102a.zip | |
Continued effort to deglobalize the router
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 5f8bc6f325..0fa2a8b90c 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__(:rewrite_options, parameters) + options = @controller.__send__(:merge_options, parameters) options.update(:only_path => true, :action => action) url = ActionController::UrlRewriter.new(@request, parameters) |