diff options
| author | Zachary Scott <e@zzak.io> | 2015-04-12 20:22:35 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2015-04-12 20:22:35 -0700 |
| commit | dc70f710018689dc4e487de534c0d40d5724ef6d (patch) | |
| tree | ba1668471fda3356368358a856b5d795be7788b5 /actionpack/test | |
| parent | f1af967e0055a33c45071848a049ff342e9c291e (diff) | |
| parent | e085a7ddb879430133c68ccfea1f2be5cccdcfa3 (diff) | |
| download | rails-dc70f710018689dc4e487de534c0d40d5724ef6d.tar.gz rails-dc70f710018689dc4e487de534c0d40d5724ef6d.tar.bz2 rails-dc70f710018689dc4e487de534c0d40d5724ef6d.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/controller/force_ssl_test.rb | 25 |
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 |