aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/testing
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-04-27 13:11:17 -0500
committerJoshua Peek <josh@joshpeek.com>2009-04-27 13:11:17 -0500
commit21aa32692caf91f56d1c5c411baae635fa398344 (patch)
tree1b9c59452e40f6908599196598b7c07a6d07dee0 /actionpack/lib/action_controller/testing
parentdde063507ac40fda1a67f06a54c1a57d237f57b2 (diff)
downloadrails-21aa32692caf91f56d1c5c411baae635fa398344.tar.gz
rails-21aa32692caf91f56d1c5c411baae635fa398344.tar.bz2
rails-21aa32692caf91f56d1c5c411baae635fa398344.zip
Delegate controller.session to request.session and deprecate response session
Diffstat (limited to 'actionpack/lib/action_controller/testing')
-rw-r--r--actionpack/lib/action_controller/testing/process.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb
index c532a67e78..d073d06b19 100644
--- a/actionpack/lib/action_controller/testing/process.rb
+++ b/actionpack/lib/action_controller/testing/process.rb
@@ -165,7 +165,7 @@ module ActionController #:nodoc:
# A shortcut to the flash. Returns an empty hash if no session flash exists.
def flash
- session['flash'] || {}
+ request.session['flash'] || {}
end
# Do we have a flash?