Changeset 4915

Timestamp:

09/03/06 16:40:01 (2 years ago)

Author:

bitsweat

Message:

Cleanup assert_tag :children counting. Closes #2181.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb (modified) (1 diff)
• trunk/actionpack/test/controller/test_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*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]

trunk/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb

@@ -456 +456 @@
-      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

trunk/actionpack/test/controller/test_test.rb

@@ -216 +216 @@
-    # 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 }