aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/test_case.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-05 15:10:20 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-05 16:05:55 -0300
commit3cba6eee66a4c25b93839ea6fd1da08d7780f2de (patch)
tree737150e38db6b8d3e683e944cb24f89d46a33207 /actionpack/lib/action_controller/test_case.rb
parentf7cde3eb2231f31764739a9abdf2610dd2721fe8 (diff)
downloadrails-3cba6eee66a4c25b93839ea6fd1da08d7780f2de.tar.gz
rails-3cba6eee66a4c25b93839ea6fd1da08d7780f2de.tar.bz2
rails-3cba6eee66a4c25b93839ea6fd1da08d7780f2de.zip
Revert "fix the Flash middleware loading the session on every request (very dangerous especially with Rack::Cache), it should only be loaded when the flash method is called"
This reverts commits e3069c64b2c5ddc7a5789b55b8efd4902d9e9729 and 2b2983d76fd11efc219273036a612f47cfaa5bfa. Reason: This add a non-backward compatible change in the way that flash works now (swept in every request).
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r--actionpack/lib/action_controller/test_case.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 67c55a7f40..05e3cd40b5 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -460,6 +460,7 @@ module ActionController
@request.session = ActionController::TestSession.new(session) if session
@request.session["flash"] = @request.flash.update(flash || {})
+ @request.session["flash"].sweep
@controller.request = @request
build_request_uri(action, parameters)