Updated html-scanner so that assert_tag(:tag => "p", :content => "foo") behaves as expected

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 4 insertions, 4 deletions

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 8d1c711226..6d045b0367 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb
@@ -379,9 +379,9 @@ module HTML #:nodoc:
     #                               :child => /hello world/ }
     def match(conditions)
       conditions = validate_conditions(conditions)
-  
-      # only Text nodes have content
-      return false if conditions[:content]
+
+      # check content of child nodes
+      return false unless children.find { |child| child.match(conditions[:content]) } if conditions[:content]
 
       # test the name
       return false unless match_condition(@name, conditions[:tag]) if conditions[:tag]
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb
index 0b4d184a8b..99a8d5766c 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb
@@ -3,7 +3,7 @@ module HTML #:nodoc:
 
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
 
     STRING = [ MAJOR, MINOR, TINY ].join(".")