2 files changed, 30 insertions, 0 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index d3359e79a6..3d667f0a2f 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -131,6 +131,13 @@ class AssertSelectTest < ActionController::TestCase
     assert_raise(Assertion) { assert_select "pre", :html=>text }
   end
 
+  def test_strip_textarea
+    render_html %Q{<textarea>\n\nfoo\n</textarea>}
+    assert_select "textarea", "\nfoo\n"
+    render_html %Q{<textarea>\nfoo</textarea>}
+    assert_select "textarea", "foo"
+  end
+
   def test_counts
     render_html %Q{<div id="1">foo</div><div id="2">foo</div>}
     assert_nothing_raised               { assert_select "div", 2 }
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb
index 7feeda25b3..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]
 
@@ -109,6 +117,21 @@ class ForceSSLExceptActionTest < ActionController::TestCase
   end
 end
 
+class ForceSSLIfConditionTest < ActionController::TestCase
+  tests ForceSSLIfCondition
+
+  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
   tests ForceSSLFlash