aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/force_ssl_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-04-09 14:12:49 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-04-09 14:12:49 -0300
commitd215620340be7cb29e2aa87aab22da5ec9e6e6a7 (patch)
treeae8a01086d98a67677b7af438823a393c3f3fb66 /actionpack/test/controller/force_ssl_test.rb
parentbbbbfe1ac02162ecb5e9a7b560134a3221f129f3 (diff)
parent242c5c7ae4b9dbc1558ee9d673335f2b1e209188 (diff)
downloadrails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.tar.gz
rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.tar.bz2
rails-d215620340be7cb29e2aa87aab22da5ec9e6e6a7.zip
Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error
Fix fails to force_ssl_redirection if session_store is disabled
Diffstat (limited to 'actionpack/test/controller/force_ssl_test.rb')
-rw-r--r--actionpack/test/controller/force_ssl_test.rb25
1 files changed, 25 insertions, 0 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 04222745d9..a1bb1cee58 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -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