aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-03-01 19:40:37 +0000
committerJamis Buck <jamis@37signals.com>2006-03-01 19:40:37 +0000
commit8368b5960b5128deed17fcf9d7cda5c70da9d972 (patch)
treec260d7294381ef91b0b45148cc291088183da688 /actionpack/lib/action_controller
parentabeb77b2868d185ff7604855f2d5cf198bd9a460 (diff)
downloadrails-8368b5960b5128deed17fcf9d7cda5c70da9d972.tar.gz
rails-8368b5960b5128deed17fcf9d7cda5c70da9d972.tar.bz2
rails-8368b5960b5128deed17fcf9d7cda5c70da9d972.zip
restore elided TestProcess#assigns method
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3725 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_process.rb13
1 files changed, 7 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 3d23710339..405396ddae 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -325,12 +325,13 @@ module ActionController #:nodoc:
get(@response.redirected_to.delete(:action), @response.redirected_to.stringify_keys)
end
- def build_request_uri(action, parameters)
- options = @controller.send(:rewrite_options, parameters)
- options.update(:only_path => true, :action => action)
- url = ActionController::UrlRewriter.new(@request, parameters)
- @request.set_REQUEST_URI(url.rewrite(options))
- end
+ def assigns(key = nil)
+ if key.nil?
+ @response.template.assigns
+ else
+ @response.template.assigns[key.to_s]
+ end
+ end
def session
@response.session