diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
index 6bc62fdf33..f3e8eb1a22 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -435,7 +435,11 @@ module HTML #:nodoc:
# count children
if opts = conditions[:children]
- matches = children.select { |c| c.match(/./) }
+ matches = children.select do |c|
+ c.match(/./) or
+ (c.kind_of?(HTML::Tag) and (c.closing == :self or ! c.childless?))
+ end
+
matches = matches.select { |c| c.match(opts[:only]) } if opts[:only]
opts.each do |key, value|
next if key == :only
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 20fa9d60b2..04baff6ed6 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -20,6 +20,7 @@ class TestTest < Test::Unit::TestCase
render :text => <
+ 
- hello
@@ -121,8 +122,8 @@ HTML
# there is a tag with a child 'input' tag
assert_tag :child => { :tag => "input" }
- # there is no tag with a child 'a' tag
- assert_no_tag :child => { :tag => "a" }
+ # there is no tag with a child 'strong' tag
+ assert_no_tag :child => { :tag => "strong" }
end
def test_assert_tag_ancestor
@@ -233,6 +234,22 @@ HTML
:only => { :tag => "li" } } }
end
+ def test_assert_tag_children_without_content
+ process :test_html_output
+
+ # there is a form tag with an 'input' child which is a self closing tag
+ assert_tag :tag => "form",
+ :children => { :count => 1,
+ :only => { :tag => "input" } }
+
+ # the body tag has an 'a' child which in turn has an 'img' child
+ assert_tag :tag => "body",
+ :children => { :count => 1,
+ :only => { :tag => "a",
+ :children => { :count => 1,
+ :only => { :tag => "img" } } } }
+ end
+
def test_assert_generates
assert_generates 'controller/action/5', :controller => 'controller', :action => 'action', :id => '5'
end