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

Updating SelectOptionLocator to use elements

Browse Source
This commit is contained in:
Bryan Helmkamp 2008-11-30 15:15:50 -05:00
parent ac4feb3b7e
commit 0eee6d75e4
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/webrat/core/locators/select_option_locator.rb
View File

@ -13,7 +13,6 @@ module Webrat
end
def locate
# TODO - Convert to using elements
if @id_or_name_or_label
field = FieldLocator.new(@scope, @id_or_name_or_label, SelectField).locate!
@ -25,19 +24,20 @@ module Webrat
end
end
else
@scope.send(:forms).detect_mapped do |form|
select_fields = form.send(:fields_by_type, [SelectField])
select_fields.detect_mapped do |select_field|
select_field.send(:options).detect do |o|
option_element = option_elements.detect do |o|
if @option_text.is_a?(Regexp)
Webrat::XML.inner_html(o.element) =~ @option_text
Webrat::XML.inner_html(o) =~ @option_text
else
Webrat::XML.inner_html(o.element) == @option_text.to_s
end
Webrat::XML.inner_html(o) == @option_text.to_s
end
end
SelectOption.load(@scope.session, option_element)
end
end
def option_elements
Webrat::XML.xpath_search(@scope.dom, *SelectOption.xpath_search)
end
def error_message