diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2009-04-04 17:31:11 +0100 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2009-04-04 17:31:11 +0100 |
commit | c55507e8ceca44558179a705118740540d7871b4 (patch) | |
tree | 59937226af81d49ce094e1282b90f0047ef15a36 /actionpack/lib/action_controller/test_process.rb | |
parent | 4fe6d43cabe3bb2e094f308d010209c78005a3b9 (diff) | |
parent | 0e9efae4745e232b1c778fda69ee110e42a223a7 (diff) | |
download | rails-c55507e8ceca44558179a705118740540d7871b4.tar.gz rails-c55507e8ceca44558179a705118740540d7871b4.tar.bz2 rails-c55507e8ceca44558179a705118740540d7871b4.zip |
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_controller/test_process.rb')
-rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 9dd09c30b4..b2d1341573 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -13,6 +13,7 @@ module ActionController #:nodoc: @query_parameters = {} @session = TestSession.new + @session_options ||= {} initialize_default_values initialize_containers @@ -110,6 +111,7 @@ module ActionController #:nodoc: end def recycle! + @env["action_controller.request.request_parameters"] = {} self.query_parameters = {} self.path_parameters = {} @headers, @request_method, @accepts, @content_type = nil, nil, nil, nil |