From be46586e691e28f3937666c3fff037eef22406de Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 12 Jun 2014 20:48:21 -0700 Subject: Set flash in test session when necessary. `to_session_value` returns nil when empty. --- actionpack/lib/action_controller/test_case.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index e6695ffc90..849286a4a9 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -629,8 +629,11 @@ module ActionController @response.prepare! @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {} - @request.session['flash'] = @request.flash.to_session_value - @request.session.delete('flash') if @request.session['flash'].blank? + + if flash_value = @request.flash.to_session_value + @request.session['flash'] = flash_value + end + @response end -- cgit v1.2.3