0
@@ -10,8 +10,9 @@ module Webrat
0
       @selenium.open(url)
0
     end
0
     
0
-    def fills_in(label_text, options)
0
-      @selenium.type("webrat=#{Regexp.escape(label_text)}", "#{options[:with]}")
0
+    def fills_in(field_identifier, options)
0
+      locator = "webrat=#{Regexp.escape(field_identifier)}"
0
+      @selenium.type(locator, "#{options[:with]}")
0
     end
0
     
0
     def response_body
0
@@ -29,6 +30,11 @@ module Webrat
0
       @selenium.click("webratlink=#{link_text}")
0
       wait_for_result(options[:wait])
0
     end
0
+    
0
+    def clicks_link_within(selector, link_text, options = {})
0
+      @selenium.click("webratlinkwithin=#{selector}|#{link_text}")
0
+      wait_for_result(options[:wait])
0
+    end
0
 
0
     def wait_for_result(wait_type)
0
       if wait_type == :ajax
0
@@ -130,6 +136,24 @@ module Webrat
0
         return candidateLinks.first();
0
       JS
0
       
0
+      @selenium.add_location_strategy('webratlinkwithin', <<-JS)
0
+        var locatorParts = locator.split('|');
0
+        var cssAncestor = locatorParts[0];
0
+        var linkText = locatorParts[1];
0
+        var matchingElements = cssQuery(cssAncestor, inDocument);
0
+        var candidateLinks = matchingElements.collect(function(ancestor){
0
+          var links = ancestor.getElementsByTagName('a');
0
+          return $A(links).select(function(candidateLink) {
0
+            return PatternMatcher.matches(linkText, getText(candidateLink));
0
+          });
0
+        }).flatten().compact();
0
+        if (candidateLinks.length == 0) {
0
+          return null;
0
+        }
0
+        candidateLinks = candidateLinks.sortBy(function(s) { return s.length * -1; }); //reverse length sort
0
+        return candidateLinks.first();
0
+      JS
0
+      
0
       @selenium.add_location_strategy('webratselectwithoption', <<-JS)
0
         var optionElements = inDocument.getElementsByTagName('option');
0
         var locatedOption = $A(optionElements).find(function(candidate){