Ticket #8649: flash_preservation.diff

test/ssl_requirement_test.rb

@@ -44 +44 @@
-  def d
-    render :nothing => true
-  end
+  
+  def set_flash
+    flash[:foo] = "bar"
+  end
-end
-
-class SslRequirementTest < Test::Unit::TestCase
@@ -53 +57 @@
-    @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
-l
+L
-    get :b
-    assert_response :redirect
-l
+L
-  end
-  
-  def test_required_with_ssl
@@ -81 +115 @@
-    @request.env['HTTPS'] = "on"
-    get :d
-    assert_response :redirect
-l
+L
-  end
-
-  def test_allowed_without_ssl

lib/ssl_requirement.rb

@@ -51 +51 @@
-
-      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