github-migration/webrat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

field_labeled() should disregard labels without matching fields

Browse Source
This commit is contained in:
Kyle Hargraves 2009-01-18 15:43:51 -06:00
parent cbd323ac37
commit 2b38b78724
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
History.txt
View File

@ -68,6 +68,7 @@
* Bug fixes * 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. * Fixed bug where Scope was creating a new DOM rather than re-using the existing DOM.
[#105] (Zach Dennis) [#105] (Zach Dennis)
* Support Rails > v2.2 by using ActionController::RequestParser for param parsing [#107] * Support Rails > v2.2 by using ActionController::RequestParser for param parsing [#107]

4
lib/webrat/core/locators/field_labeled_locator.rb
View File

@ -7,7 +7,7 @@ module Webrat
class FieldLabeledLocator < Locator # :nodoc: class FieldLabeledLocator < Locator # :nodoc:
def locate def locate
matching_labels.any? && matching_labels.first.field matching_labels.any? && matching_labels.detect_mapped { |label| label.field }
end end
def matching_labels def matching_labels
@ -53,4 +53,4 @@ module Webrat
end end
end end
end end

15
spec/public/locators/field_labeled_spec.rb
View File

@ -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" 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" should_raise_error_matching /Could not find .* "Other Label"/, :for => "Other Label"
end 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 end