Changeset 1661

Timestamp:

07/04/05 15:05:40 (3 years ago)

Author:

minam

Message:

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

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/assertions.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb (modified) (1 diff)
• trunk/actionpack/lib/action_controller/vendor/html-scanner/html/version.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -116 +116 @@
-* Support :render option for :verify #1440 [TobiasLuetke]
-
-1, for bug fixes and optimizations
+2, for bug fixes and optimizations. The :content option may be used as expected--to find a tag whose textual content is a particular value--in assert_tag, now.
-
-* Changed test requests to come from 0.0.0.0 instead of 127.0.0.1 such that they don't trigger debugging screens on exceptions, but instead call rescue_action_in_public

trunk/actionpack/lib/action_controller/assertions.rb

@@ -192 +192 @@
-      #     to match on the children, and only matching children will be
-      #     counted.
-
-
+
+
+
-      #
-      # Conditions are matched using the following algorithm:

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

@@ -380 +380 @@
-    def match(conditions)
-      conditions = validate_conditions(conditions)
-
-only Text nodes have content
-
+
+check content of child nodes
+unless children.find { |child| child.match(conditions[:content]) } 
-
-      # test the name

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

@@ -4 +4 @@
-    MAJOR = 0
-    MINOR = 5
-1
+2
-
-    STRING = [ MAJOR, MINOR, TINY ].join(".")