From e085a7ddb879430133c68ccfea1f2be5cccdcfa3 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Sun, 12 Apr 2015 22:26:35 -0300
Subject: Revert "Merge pull request #19682 from
 supercaracal/fix_force_ssl_redirection_flash_error"

This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing
changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
---
 .../lib/action_controller/metal/force_ssl.rb       |  2 +-
 actionpack/lib/action_controller/test_case.rb      |  7 ++----
 actionpack/test/controller/force_ssl_test.rb       | 25 ----------------------
 3 files changed, 3 insertions(+), 31 deletions(-)

(limited to 'actionpack')

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')
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index e1e423675f..5639abdc56 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -321,29 +321,4 @@ class RedirectToSSLTest < ActionController::TestCase
     assert_response 200
     assert_equal 'ihaz', response.body
   end
-
-  def test_banana_redirects_to_https_if_not_https_and_flash_middleware_is_disabled
-    disable_flash
-    get :banana
-    assert_response 301
-    assert_equal 'https://test.host/redirect_to_ssl/banana', redirect_to_url
-  ensure
-    enable_flash
-  end
-
-  private
-
-  def disable_flash
-    ActionDispatch::TestRequest.class_eval do
-      alias_method :flash_origin, :flash
-      undef_method :flash
-    end
-  end
-
-  def enable_flash
-    ActionDispatch::TestRequest.class_eval do
-      alias_method :flash, :flash_origin
-      undef_method :flash_origin
-    end
-  end
 end
-- 
cgit v1.2.3