aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_process.rb
diff options
context:
space:
mode:
authorColin Curtin <colin@procore.com>2008-11-26 10:18:03 -0800
committerColin Curtin <colin@procore.com>2008-11-26 10:18:03 -0800
commit4812e350b9e96641a29c8db6ea153426dad1c9a2 (patch)
tree1aa5ab05d8ff420c833677505f9b884ec61e4627 /actionpack/lib/action_controller/test_process.rb
parent78af01f80b3622237462d150aca4aba18204c093 (diff)
parentd18bfa2a4165297dbf5e6b1fff1731fefa9dd135 (diff)
downloadrails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.gz
rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.tar.bz2
rails-4812e350b9e96641a29c8db6ea153426dad1c9a2.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r--actionpack/lib/action_controller/test_process.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb
index 7a31f0e8d5..1e3a646bc9 100644
--- a/actionpack/lib/action_controller/test_process.rb
+++ b/actionpack/lib/action_controller/test_process.rb
@@ -395,6 +395,7 @@ module ActionController #:nodoc:
@html_document = nil
@request.env['REQUEST_METHOD'] ||= "GET"
+
@request.action = action.to_s
parameters ||= {}