diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-15 12:21:04 -0800 |
| commit | eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3 (patch) | |
| tree | 3b193dba9756b45e1a0a70d47faa4c3e2ff946a9 /actionpack/lib/action_controller/test_process.rb | |
| parent | 1304b664924bfea54fd6dc0dc924ae3d126ff92d (diff) | |
| parent | 4f984c9d0e66601a81cb5ae6e3b50582e6dc0c2d (diff) | |
| download | rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.gz rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.tar.bz2 rails-eeea1a26ec7bd5e11caa4630ff7820c1c7f762e3.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 1 |
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 38e15baac2..28fb148e6e 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -394,6 +394,7 @@ module ActionController #:nodoc: @html_document = nil @request.env['REQUEST_METHOD'] ||= "GET" + @request.action = action.to_s parameters ||= {} |