Permalink
Browse files

Cleanup assert_tag :children counting. Closes #2181.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4915 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent a769b88 commit db9be587196b2fdebacaecf54efe70940b006989 @jeremy jeremy committed Sep 3, 2006
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Cleanup assert_tag :children counting. #2181 [jamie@bravenet.com]
+
* button_to accepts :method so you can PUT and DELETE with it. #6005 [Dan Webb]
* Update sanitize text helper to strip plaintext tags, and <img src="javascript:bang">. [Rick Olson]
View
1 actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -455,7 +455,6 @@ def match(conditions)
# count children
if opts = conditions[:children]
matches = children.select do |c|
- c.match(/./) or
(c.kind_of?(HTML::Tag) and (c.closing == :self or ! c.childless?))
end
View
2 actionpack/test/controller/test_test.rb
@@ -215,6 +215,8 @@ def test_assert_tag_children_count
# there is a tag with 2 children
assert_tag :children => { :count => 2 }
+ # in particular, there is a <ul> tag with two children (a nameless pair of <li>s)
+ assert_tag :tag => 'ul', :children => { :count => 2 }
# there is no tag with 4 children
assert_no_tag :children => { :count => 4 }
end

0 comments on commit db9be58

Please sign in to comment.