diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-17 17:15:33 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-17 17:15:33 -0700 |
| commit | cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22 (patch) | |
| tree | 48d9c8ab7f30e7962e7a4d0ce3759a8996625e3b /activesupport/test/core_ext | |
| parent | 364879c61e68a1090eacb65481a3555298452141 (diff) | |
| parent | 3a04e370e4cc016bb7b59fe6bb704e4ca37d62f3 (diff) | |
| download | rails-cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22.tar.gz rails-cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22.tar.bz2 rails-cb0dbe35b85c910b4a75306d7d52ee4ca47b8d22.zip | |
Merge pull request #3049 from brainopia/fix_to_query_edge_case
Fix Hash#to_query edge case with html_safe string on 1.8 ruby
Diffstat (limited to 'activesupport/test/core_ext')
| -rw-r--r-- | activesupport/test/core_ext/object/to_query_test.rb | 9 |
1 files changed, 9 insertions, 0 deletions
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 |