aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-04-12 22:26:35 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2015-04-12 22:26:35 -0300
commite085a7ddb879430133c68ccfea1f2be5cccdcfa3 (patch)
tree620cbba1bf2fc9fedb5279ed29412188bb6cbe8c /actionpack/test/controller
parent93d2eeaad5f7e2a362297384fb840461980f675e (diff)
downloadrails-e085a7ddb879430133c68ccfea1f2be5cccdcfa3.tar.gz
rails-e085a7ddb879430133c68ccfea1f2be5cccdcfa3.tar.bz2
rails-e085a7ddb879430133c68ccfea1f2be5cccdcfa3.zip
Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_error"
This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/force_ssl_test.rb25
1 files changed, 0 insertions, 25 deletions
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