diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-15 14:44:27 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-15 14:55:13 -0600 |
| commit | ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb (patch) | |
| tree | a6213e17ef6d01215b606b5fd11dcd05ca0dafda /actionpack/lib/action_controller/test_case.rb | |
| parent | 3da29f647bad5e79c90721ac23658940abddd27c (diff) | |
| download | rails-ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb.tar.gz rails-ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb.tar.bz2 rails-ead93c5be5b0f1945b7d0302f1aae4685ee3f2fb.zip | |
Move Flash into middleware
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 7e6da0e61d..14557ca782 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -239,13 +239,15 @@ module ActionController @request.assign_parameters(@controller.class.name.underscore.sub(/_controller$/, ''), action.to_s, parameters) @request.session = ActionController::TestSession.new(session) unless session.nil? - @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash + @request.session["flash"] = @request.flash.update(flash || {}) + @request.session["flash"].sweep @controller.request = @request @controller.params.merge!(parameters) build_request_uri(action, parameters) Base.class_eval { include Testing } @controller.process_with_new_base_test(@request, @response) + @request.session.delete('flash') if @request.session['flash'].blank? @response end |