@@ -51,9 +51,11 @@ module SslRequirement if ssl_required? && !request.ssl? redirect_to "https://" + request.host + request.request_uri + flash.keep return false elsif request.ssl? && !ssl_required? redirect_to "http://" + request.host + request.request_uri + flash.keep return false end end lib/ssl_requirement.rb @@ -44,6 +44,10 @@ class SslRequirementController < ActionController::Base def d render :nothing => true end + + def set_flash + flash[:foo] = "bar" + end end class SslRequirementTest < Test::Unit::TestCase @@ -53,14 +57,44 @@ class SslRequirementTest < Test::Unit::TestCase @response = ActionController::TestResponse.new end + def test_redirect_to_https_preserves_flash + get :set_flash + get :b + assert_response :redirect + assert_equal "bar", flash[:foo] + end + + def test_not_redirecting_to_https_does_not_preserve_the_flash + get :set_flash + get :d + assert_response :success + assert_nil flash[:foo] + end + + def test_redirect_to_http_preserves_flash + get :set_flash + @request.env['HTTPS'] = "on" + get :d + assert_response :redirect + assert_equal "bar", flash[:foo] + end + + def test_not_redirecting_to_http_does_not_preserve_the_flash + get :set_flash + @request.env['HTTPS'] = "on" + get :a + assert_response :success + assert_nil flash[:foo] + end + def test_required_without_ssl assert_not_equal "on", @request.env["HTTPS"] get :a assert_response :redirect - assert_match %r{^https://}, @response.headers['location'] + assert_match %r{^https://}, @response.headers['Location'] get :b assert_response :redirect - assert_match %r{^https://}, @response.headers['location'] + assert_match %r{^https://}, @response.headers['Location'] end def test_required_with_ssl @@ -81,7 +115,7 @@ class SslRequirementTest < Test::Unit::TestCase @request.env['HTTPS'] = "on" get :d assert_response :redirect - assert_match %r{^http://}, @response.headers['location'] + assert_match %r{^http://}, @response.headers['Location'] end def test_allowed_without_ssl test/ssl_requirement_test.rb aa2dded823f8a9b378c22ba0159971508918928a Jeremy Kemper jeremy@bitsweat.net http://github.com/rails/ssl_requirement/commit/34a9a138c4093bd7d5678822f8f1e62c31d47299 34a9a138c4093bd7d5678822f8f1e62c31d47299 2008-02-01T21:16:53-08:00 2008-02-01T21:16:53-08:00 SSL requirement plugin keeps flash when it redirects. Closes #8649 [rundeks, fogle] 234ebc2ec7865ccf38a8751df6d51e6ed113b650 Jeremy Kemper jeremy@bitsweat.net