aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/force_ssl_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-02-07 10:34:38 -0800
committerJosé Valim <jose.valim@plataformatec.com.br>2012-02-07 10:34:38 -0800
commit12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e (patch)
tree9866451e41e9562a51bdc91f732794d7db979d6c /actionpack/test/controller/force_ssl_test.rb
parent275c3a1cb3d0f38d1a28b1a8d6145a4d7e379acc (diff)
parent30e5503d004971a8c7ddb039f9023dca3a6bdcd7 (diff)
downloadrails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.tar.gz
rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.tar.bz2
rails-12c3b3d65738eccb7b7a043b2a8a1ba65a46d34e.zip
Merge pull request #4928 from rmm5t/fix_force_ssl_redirect_with_params_master
Fix force_ssl redirect with params
Diffstat (limited to 'actionpack/test/controller/force_ssl_test.rb')
-rw-r--r--actionpack/test/controller/force_ssl_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 3ea3c06ac4..b681a19fe0 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -50,6 +50,12 @@ class ForceSSLControllerLevelTest < ActionController::TestCase
assert_equal "https://test.host/force_ssl_controller_level/banana", redirect_to_url
end
+ def test_banana_redirects_to_https_with_extra_params
+ get :banana, :token => "secret"
+ assert_response 301
+ assert_equal "https://test.host/force_ssl_controller_level/banana?token=secret", redirect_to_url
+ end
+
def test_cheeseburger_redirects_to_https
get :cheeseburger
assert_response 301