diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-10-25 17:22:55 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-10-25 17:22:55 -0500 |
| commit | 1d9ab88ee6360f54197ce21624d844425ec627b3 (patch) | |
| tree | 252b3daf0d84e2a050c0da97b758f9ba06a3545e /actionpack/test/template | |
| parent | 5daf07704ad21d885661216281ffc48b6ea6adfb (diff) | |
| parent | 8aabdc69b7c498770e4c2864dad3e2790a40d10f (diff) | |
| download | rails-1d9ab88ee6360f54197ce21624d844425ec627b3.tar.gz rails-1d9ab88ee6360f54197ce21624d844425ec627b3.tar.bz2 rails-1d9ab88ee6360f54197ce21624d844425ec627b3.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/template')
| -rw-r--r-- | actionpack/test/template/html-scanner/tag_node_test.rb | 7 | ||||
| -rw-r--r-- | actionpack/test/template/number_helper_test.rb | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/test/template/html-scanner/tag_node_test.rb b/actionpack/test/template/html-scanner/tag_node_test.rb index 0d87f1bd42..3b72243e7d 100644 --- a/actionpack/test/template/html-scanner/tag_node_test.rb +++ b/actionpack/test/template/html-scanner/tag_node_test.rb @@ -55,7 +55,12 @@ class TagNodeTest < Test::Unit::TestCase def test_to_s node = tag("<a b=c d='f' g=\"h 'i'\" />") - assert_equal %(<a b="c" d="f" g="h 'i'" />), node.to_s + node = node.to_s + assert node.include?('a') + assert node.include?('b="c"') + assert node.include?('d="f"') + assert node.include?('g="h') + assert node.include?('i') end def test_tag diff --git a/actionpack/test/template/number_helper_test.rb b/actionpack/test/template/number_helper_test.rb index 0e3475d98b..8d679aac1d 100644 --- a/actionpack/test/template/number_helper_test.rb +++ b/actionpack/test/template/number_helper_test.rb @@ -27,6 +27,7 @@ class NumberHelperTest < ActionView::TestCase assert_equal("800 555 1212", number_to_phone(8005551212, {:delimiter => " "})) assert_equal("(800) 555-1212 x 123", number_to_phone(8005551212, {:area_code => true, :extension => 123})) assert_equal("800-555-1212", number_to_phone(8005551212, :extension => " ")) + assert_equal("555.1212", number_to_phone(5551212, :delimiter => '.')) assert_equal("800-555-1212", number_to_phone("8005551212")) assert_equal("+1-800-555-1212", number_to_phone(8005551212, :country_code => 1)) assert_equal("+18005551212", number_to_phone(8005551212, :country_code => 1, :delimiter => '')) |