@@ -68,6 +68,7 @@
* Bug fixes
+ * field_labeled should disregard labels without matching fields (Kyle Hargraves)
* Fixed bug where Scope was creating a new DOM rather than re-using the existing DOM.
[#105] (Zach Dennis)
* Support Rails > v2.2 by using ActionController::RequestParser for param parsing [#107]
History.txt
@@ -7,7 +7,7 @@ module Webrat
class FieldLabeledLocator < Locator # :nodoc:
def locate
- matching_labels.any? && matching_labels.first.field
+ matching_labels.any? && matching_labels.detect_mapped { |label| label.field }
end
def matching_labels
@@ -53,4 +53,4 @@ module Webrat
end
end
-end
\ No newline at end of file
+end
lib/webrat/core/locators/field_labeled_locator.rb
@@ -138,5 +138,20 @@ describe "field_labeled" do
with_an_id_of "element_42", :for => "A label with a link on it's own line"
should_raise_error_matching /Could not find .* "Other Label"/, :for => "Other Label"
end
+
+ describe "finding a field when labels without fields also match" do
+ using_this_html <<-HTML
+ <html>
+ <label>The Label</label>
+ <form>
+ <label for="element_42">The Label</label>
+ <input type="text" id="element_42">
+ </form>
+ </html>
+ HTML
+
+ should_return_a Webrat::TextField, :for => "The Label"
+ with_an_id_of "element_42", :for => "The Label"
+ end
end
spec/public/locators/field_labeled_spec.rb
cbd323ac37ee5fdee7339f4bb9caf921ed9f0cd0
Kyle Hargraves
philodespotos@gmail.com
http://github.com/johnnyt/webrat/commit/2b38b787245911555dd1787dfb5dee12ca324973
2b38b787245911555dd1787dfb5dee12ca324973
2009-01-18T13:57:08-08:00
2009-01-18T13:43:51-08:00
field_labeled() should disregard labels without matching fields
25bf26e6d1c885819368aedc100ab2726d20783e
Kyle Hargraves
philodespotos@gmail.com