Merge pull request #15682 from tgxworld/controller_test_process

Set flash in test session when necessary.
2014-06-13 11:24:03 -03:00 · 2014-06-13 11:24:03 -03:00 · 0bfdf40870
commit 0bfdf40870
parent b71d46a81a be46586e69
1 changed files with 5 additions and 2 deletions
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@ -629,8 +629,11 @@ def process(action, http_method = 'GET', *args)
        @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