aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_controller/test_process.rb2
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