diff options
author | Michael Koziarski <michael@koziarski.com> | 2006-07-28 23:15:12 +0000 |
---|---|---|
committer | Michael Koziarski <michael@koziarski.com> | 2006-07-28 23:15:12 +0000 |
commit | d02c07dbb990753d339e5c49e8ccddfa0a052c6b (patch) | |
tree | 8f722e49d2fd09a17704473ed2cf99b966d0c08b | |
parent | 2e88b5d37feb5f0b1554e70dc18b9fbc67e68877 (diff) | |
download | rails-d02c07dbb990753d339e5c49e8ccddfa0a052c6b.tar.gz rails-d02c07dbb990753d339e5c49e8ccddfa0a052c6b.tar.bz2 rails-d02c07dbb990753d339e5c49e8ccddfa0a052c6b.zip |
Ensure TestRequest#session always returns a TestSession [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index a5d1d2a771..46a2a40f95 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* TestRequest#reset_session should restore a TestSession, not a hash [Koz] + * Don't search a load-path of '.' for controller files [Jamis Buck] * Update integration.rb to require test_process explicitly instead of via Dependencies. [Nicholas Seckar] diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 6b3bf04c27..a3c456dd3d 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -38,7 +38,7 @@ module ActionController #:nodoc: end def reset_session - @session = {} + @session = TestSession.new end def raw_post |