2 files changed, 19 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/object/inclusion_test.rb b/activesupport/test/core_ext/object/inclusion_test.rb
index 1de857d678..568ebe9aab 100644
--- a/activesupport/test/core_ext/object/inclusion_test.rb
+++ b/activesupport/test/core_ext/object/inclusion_test.rb
@@ -2,6 +2,16 @@ require 'abstract_unit'
 require 'active_support/core_ext/object/inclusion'
 
 class InTest < Test::Unit::TestCase
+  def test_in_multiple_args
+    assert :b.in?(:a,:b)
+    assert !:c.in?(:a,:b)
+  end
+  
+  def test_in_multiple_arrays
+    assert [1,2].in?([1,2],[2,3])
+    assert ![1,2].in?([1,3],[2,1])
+  end
+  
   def test_in_array
     assert 1.in?([1,2])
     assert !3.in?([1,2])
diff --git a/activesupport/test/core_ext/object/to_query_test.rb b/activesupport/test/core_ext/object/to_query_test.rb
index 84da52f4bf..c146f6cc9b 100644
--- a/activesupport/test/core_ext/object/to_query_test.rb
+++ b/activesupport/test/core_ext/object/to_query_test.rb
@@ -1,6 +1,7 @@
 require 'abstract_unit'
 require 'active_support/ordered_hash'
 require 'active_support/core_ext/object/to_query'
+require 'active_support/core_ext/string/output_safety.rb'
 
 class ToQueryTest < Test::Unit::TestCase
   def test_simple_conversion
@@ -11,6 +12,14 @@ class ToQueryTest < Test::Unit::TestCase
     assert_query_equal 'a%3Ab=c+d', 'a:b' => 'c d'
   end
 
+  def test_html_safe_parameter_key
+    assert_query_equal 'a%3Ab=c+d', 'a:b'.html_safe => 'c d'
+  end
+
+  def test_html_safe_parameter_value
+    assert_query_equal 'a=%5B10%5D', 'a' => '[10]'.html_safe
+  end
+
   def test_nil_parameter_value
     empty = Object.new
     def empty.to_param; nil end