Merge branch 'master' of github.com:rails/rails

2 files changed, 3 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb
index 5a8c7db162..d920668184 100644
--- a/actionpack/lib/action_controller/metal/force_ssl.rb
+++ b/actionpack/lib/action_controller/metal/force_ssl.rb
@@ -89,7 +89,7 @@ module ActionController
         end
 
         secure_url = ActionDispatch::Http::URL.url_for(options.slice(*URL_OPTIONS))
-        flash.keep if request.respond_to?(:flash)
+        flash.keep if respond_to?(:flash)
         redirect_to secure_url, options.slice(*REDIRECT_OPTIONS)
       end
     end
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index 6ffd7a7d2b..33c24999f9 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -659,9 +659,7 @@ module ActionController
         @request.assign_parameters(@routes, controller_class_name, action.to_s, parameters)
 
         @request.session.update(session) if session
-
-        is_request_flash_enabled = @request.respond_to?(:flash)
-        @request.flash.update(flash || {}) if is_request_flash_enabled
+        @request.flash.update(flash || {})
 
         if xhr
           @request.env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
@@ -687,8 +685,7 @@ module ActionController
 
         @assigns = @controller.respond_to?(:view_assigns) ? @controller.view_assigns : {}
 
-        flash_value = is_request_flash_enabled ? @request.flash.to_session_value : nil
-        if flash_value
+        if flash_value = @request.flash.to_session_value
           @request.session['flash'] = flash_value
         else
           @request.session.delete('flash')