1 files changed, 28 insertions, 3 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 00d4612ac9..a1bb1cee58 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -100,7 +100,7 @@ class ForceSSLControllerLevelTest < ActionController::TestCase
   end
 
   def test_banana_redirects_to_https_with_extra_params
-    get :banana, :token => "secret"
+    get :banana, params: { token: "secret" }
     assert_response 301
     assert_equal "https://test.host/force_ssl_controller_level/banana?token=secret", redirect_to_url
   end
@@ -273,7 +273,7 @@ class ForceSSLFormatTest < ActionController::TestCase
         get '/foo', :to => 'force_ssl_controller_level#banana'
       end
 
-      get :banana, :format => :json
+      get :banana, format: :json
       assert_response 301
       assert_equal 'https://test.host/foo.json', redirect_to_url
     end
@@ -294,7 +294,7 @@ class ForceSSLOptionalSegmentsTest < ActionController::TestCase
       end
 
       @request.env['PATH_INFO'] = '/en/foo'
-      get :banana, :locale => 'en'
+      get :banana, params: { locale: 'en' }
       assert_equal 'en',  @controller.params[:locale]
       assert_response 301
       assert_equal 'https://test.host/en/foo', redirect_to_url
@@ -321,4 +321,29 @@ 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