diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-27 20:30:05 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-10-27 20:30:05 +0000 |
| commit | a55caf666cf4c00bdc5d73ac21ef92d6456cdf62 (patch) | |
| tree | 0e4c7ba7841f9d74bc22643df3374be0db4fbd8d /actionpack | |
| parent | 4b639904d7bc4407657767bb963997bc78678d03 (diff) | |
| download | rails-a55caf666cf4c00bdc5d73ac21ef92d6456cdf62.tar.gz rails-a55caf666cf4c00bdc5d73ac21ef92d6456cdf62.tar.bz2 rails-a55caf666cf4c00bdc5d73ac21ef92d6456cdf62.zip | |
Tested FormHelper#label. Closes #9850 [jarkko]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8045 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/test/template/form_helper_test.rb | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 51b4135886..a7fa597c89 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -103,7 +103,7 @@ * Fixed that setting the :host option in url_for would automatically turn off :only_path (since :host would otherwise not be shown) #9586 [Bounga] -* Added FormHelper#label #8641 [jcoglan] +* Added FormHelper#label. #8641, #9850 [jcoglan, jarkko] * Added AtomFeedHelper (slightly improved from the atom_feed_helper plugin) [DHH] diff --git a/actionpack/test/template/form_helper_test.rb b/actionpack/test/template/form_helper_test.rb index f37469954a..fa53f6ae1a 100644 --- a/actionpack/test/template/form_helper_test.rb +++ b/actionpack/test/template/form_helper_test.rb @@ -273,6 +273,10 @@ class FormHelperTest < Test::Unit::TestCase def test_auto_index pid = @post.id assert_dom_equal( + "<label for=\"post_#{pid}_title\">Title</label>", + label("post[]", "title") + ) + assert_dom_equal( "<input id=\"post_#{pid}_title\" name=\"post[#{pid}][title]\" size=\"30\" type=\"text\" value=\"Hello World\" />", text_field("post[]","title") ) assert_dom_equal( @@ -361,6 +365,7 @@ class FormHelperTest < Test::Unit::TestCase _erbout = '' form_for("post[]", @post) do |f| + _erbout.concat f.label(:title) _erbout.concat f.text_field(:title) _erbout.concat f.text_area(:body) _erbout.concat f.check_box(:secret) @@ -368,6 +373,7 @@ class FormHelperTest < Test::Unit::TestCase expected = "<form action='http://www.example.com' method='post'>" + + "<label for=\"post_123_title\">Title</label>" + "<input name='post[123][title]' size='30' type='text' id='post_123_title' value='Hello World' />" + "<textarea name='post[123][body]' id='post_123_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>" + "<input name='post[123][secret]' checked='checked' type='checkbox' id='post_123_secret' value='1' />" + @@ -430,10 +436,12 @@ class FormHelperTest < Test::Unit::TestCase def test_fields_for_object_with_bracketed_name _erbout = '' fields_for("author[post]", @post) do |f| + _erbout.concat f.label(:title) _erbout.concat f.text_field(:title) end - assert_dom_equal "<input name='author[post][title]' size='30' type='text' id='author_post_title' value='Hello World' />", + assert_dom_equal "<label for=\"author_post_title\">Title</label>" + + "<input name='author[post][title]' size='30' type='text' id='author_post_title' value='Hello World' />", _erbout end |