1 files changed, 23 insertions, 11 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 125012631e..5b423c8151 100644
--- a/actionpack/test/controller/force_ssl_test.rb
+++ b/actionpack/test/controller/force_ssl_test.rb
@@ -26,6 +26,14 @@ class ForceSSLExceptAction < ForceSSLController
   force_ssl :except => :banana
 end
 
+class ForceSSLIfCondition < ForceSSLController
+  force_ssl :if => :use_force_ssl?
+
+  def use_force_ssl?
+    action_name == 'cheeseburger'
+  end
+end
+
 class ForceSSLFlash < ForceSSLController
   force_ssl :except => [:banana, :set_flash, :use_flash]
 
@@ -39,10 +47,8 @@ class ForceSSLFlash < ForceSSLController
     @flashy = flash["that"]
     render :inline => "hello"
   end
-
 end
 
-
 class ForceSSLControllerLevelTest < ActionController::TestCase
   tests ForceSSLControllerLevel
 
@@ -52,6 +58,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
@@ -105,18 +117,19 @@ class ForceSSLExceptActionTest < ActionController::TestCase
   end
 end
 
-class ForceSSLExcludeDevelopmentTest < ActionController::TestCase
-  tests ForceSSLControllerLevel
+class ForceSSLIfConditionTest < ActionController::TestCase
+  tests ForceSSLIfCondition
 
-  def setup
-    Rails.env.stubs(:development?).returns(false)
-  end
-
-  def test_development_environment_not_redirects_to_https
-    Rails.env.stubs(:development?).returns(true)
+  def test_banana_not_redirects_to_https
     get :banana
     assert_response 200
   end
+
+  def test_cheeseburger_redirects_to_https
+    get :cheeseburger
+    assert_response 301
+    assert_equal "https://test.host/force_ssl_if_condition/cheeseburger", redirect_to_url
+  end
 end
 
 class ForceSSLFlashTest < ActionController::TestCase
@@ -135,5 +148,4 @@ class ForceSSLFlashTest < ActionController::TestCase
     assert_equal "hello", assigns["flash_copy"]["that"]
     assert_equal "hello", assigns["flashy"]
   end
-
 end