Extract FieldLabeledLocator

lib/webrat/core/locators.rb

@@ -31,10 +31,9 @@ module Webrat
     end
     
     def find_field_labeled(label, *field_types) #:nodoc:
-      # TODO - Convert to using elements
+      require "webrat/core/locators/field_labeled_locator"
-      forms.detect_mapped do |form|
+      
-        form.field_labeled(label, *field_types)
+      FieldLabeledLocator.new(self, label, *field_types).locate
-      end
     end
     
     def find_field_named(name, *field_types) #:nodoc:

lib/webrat/core/locators/field_labeled_locator.rb

@@ -0,0 +1,18 @@
+require "webrat/core/locators/locator"
+
+module Webrat
+  module Locators
+    
+    class FieldLabeledLocator < Locator
+  
+      def locate
+        # TODO - Convert to using elements
+        @scope.send(:forms).detect_mapped do |form|
+          form.field_labeled(@value, *@field_types)
+        end
+      end
+  
+    end
+    
+  end
+end