aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionpack/CHANGELOG2
-rw-r--r--actionpack/lib/action_view/helpers/record_tag_helper.rb2
-rw-r--r--actionpack/test/template/record_tag_helper_test.rb59
3 files changed, 62 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 58792d9088..3bf04b5eba 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Tests for div_for and content_tag_for helpers. Closes #11223 [thechrisoshow]
+
* Allow file uploads in Integration Tests. Closes #11091 [RubyRedRick]
* Refactor partial rendering into a PartialTemplate class. [Pratik]
diff --git a/actionpack/lib/action_view/helpers/record_tag_helper.rb b/actionpack/lib/action_view/helpers/record_tag_helper.rb
index 7b82c38a0e..40b66be79f 100644
--- a/actionpack/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/record_tag_helper.rb
@@ -24,7 +24,7 @@ module ActionView
# <td><%=h @person.last_name %></td>
# <% end %>
#
- # would produce hthe following HTML (assuming @person is an instance of
+ # would produce the following HTML (assuming @person is an instance of
# a Person object, with an id value of 123):
#
# <tr id="person_123" class="person">....</tr>
diff --git a/actionpack/test/template/record_tag_helper_test.rb b/actionpack/test/template/record_tag_helper_test.rb
new file mode 100644
index 0000000000..bb5440be20
--- /dev/null
+++ b/actionpack/test/template/record_tag_helper_test.rb
@@ -0,0 +1,59 @@
+require 'abstract_unit'
+
+class Post
+ def id
+ 45
+ end
+ def body
+ "What a wonderful world!"
+ end
+end
+
+class RecordTagHelperTest < Test::Unit::TestCase
+ include ActionView::Helpers::RecordTagHelper
+ include ActionView::Helpers::CaptureHelper
+ include ActionView::Helpers::RecordIdentificationHelper
+ include ActionView::Helpers::TagHelper
+ include ActionView::Helpers::TextHelper
+ include ActionView::Helpers::UrlHelper
+
+ def setup
+ @post = Post.new
+ end
+
+ def test_content_tag_for
+ _erbout = ''
+ expected = %(<li class="post bar" id="post_45"></li>)
+ actual = content_tag_for(:li, @post, :class => 'bar') { }
+ assert_dom_equal expected, actual
+ end
+
+ def test_content_tag_for_prefix
+ _erbout = ''
+ expected = %(<ul class="post" id="archived_post_45"></ul>)
+ actual = content_tag_for(:ul, @post, :archived) { }
+ assert_dom_equal expected, actual
+ end
+
+ def test_content_tag_for_with_extra_html_tags
+ _erbout = ''
+ expected = %(<tr class="post bar" id="post_45" style='background-color: #f0f0f0'></tr>)
+ actual = content_tag_for(:tr, @post, {:class => "bar", :style => "background-color: #f0f0f0"}) { }
+ assert_dom_equal expected, actual
+ end
+
+ def test_block_works_with_content_tag_for
+ _erbout = ''
+ expected = %(<tr class="post" id="post_45">#{@post.body}</tr>)
+ actual = content_tag_for(:tr, @post) { _erbout.concat @post.body }
+ assert_dom_equal expected, actual
+ end
+
+ def test_div_for
+ _erbout = ''
+ expected = %(<div class="post bar" id="post_45">#{@post.body}</div>)
+ actual = div_for(@post, :class => "bar") { _erbout.concat @post.body }
+ assert_dom_equal expected, actual
+ end
+
+end