diff options
| author | Jamis Buck <jamis@37signals.com> | 2007-01-01 03:03:13 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2007-01-01 03:03:13 +0000 |
| commit | b75f28edb4675250e5f18cf9760e4a11a5f4c926 (patch) | |
| tree | 8a8bdd93ccb0ca81c94811a09e246af9bfe97ea4 | |
| parent | a0b1ac2ef8a5a4d8ed8544aa56d2bc87968c6069 (diff) | |
| download | rails-b75f28edb4675250e5f18cf9760e4a11a5f4c926.tar.gz rails-b75f28edb4675250e5f18cf9760e4a11a5f4c926.tar.bz2 rails-b75f28edb4675250e5f18cf9760e4a11a5f4c926.zip | |
Make sure html_document is reset between integration test requests (closes #6834)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5828 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index edc28f2027..76c0f38604 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make sure html_document is reset between integration test requests. [ctm] + * Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError. [Josh Susser] * Routing uses URI escaping for path components and CGI escaping for query parameters. [darix, Jeremy Kemper] diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index 94125936af..d77540a297 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -493,6 +493,8 @@ module ActionController %w(get post cookies assigns xml_http_request).each do |method| define_method(method) do |*args| reset! unless @integration_session + # reset the html_document variable, but only for new get/post calls + @html_document = nil unless %w(cookies assigns).include?(method) returning @integration_session.send(method, *args) do copy_session_variables! end |