aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-04-07 06:22:19 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-04-07 06:22:19 +0000
commit4ab40059b7925f35cddb0f76dba27ea6cd018de7 (patch)
tree691519981b09dffb76e950c4eb46d5799a73a1ff /actionpack/lib/action_controller
parentbd9a81ca2d34562a140dfe9a6cfecf969a01042c (diff)
downloadrails-4ab40059b7925f35cddb0f76dba27ea6cd018de7.tar.gz
rails-4ab40059b7925f35cddb0f76dba27ea6cd018de7.tar.bz2
rails-4ab40059b7925f35cddb0f76dba27ea6cd018de7.zip
Added simulation of @request.request_uri in functional tests #1038 [Jamis Buck]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1103 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/test_process.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 6a7fe64a32..3aa9ffe055 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -258,6 +258,7 @@ module Test
@request.parameters.update(parameters) unless parameters.nil?
@request.session = ActionController::TestSession.new(session) unless session.nil?
@request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
+ build_request_uri(action, parameters)
@controller.process(@request, @response)
end
@@ -282,6 +283,14 @@ module Test
def assigns(name)
@response.template.assigns[name.to_s]
end
+
+ def build_request_uri(action, parameters)
+ return if @request.env['REQUEST_URI']
+ url = ActionController::UrlRewriter.new(@request, parameters)
+ @request.set_REQUEST_URI(
+ url.rewrite(@controller.send(:rewrite_options,
+ (parameters||{}).update(:only_path => true, :action=>action))))
+ end
end
end
end