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

Converting some CSS selectors to XPath

Browse Source
This commit is contained in:
Bryan Helmkamp 2008-12-02 00:16:15 -05:00
parent e88772021b
commit a205b6fa44
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/webrat/core/elements/field.rb
View File

@ -138,7 +138,7 @@ module Webrat
end end
unless id.blank? unless id.blank?
@label_elements += Webrat::XML.css_search(form.element, "label[@for='#{id}']") @label_elements += Webrat::XML.xpath_search(form.element, ".//label[@for = '#{id}']")
end end
@label_elements @label_elements
@ -373,8 +373,8 @@ module Webrat
protected protected
def default_value def default_value
selected_options = Webrat::XML.css_search(@element, "option[@selected='selected']") selected_options = Webrat::XML.xpath_search(@element, ".//option[@selected = 'selected']")
selected_options = Webrat::XML.css_search(@element, "option:first") if selected_options.empty? selected_options = Webrat::XML.xpath_search(@element, ".//option[position() = 1]") if selected_options.empty?
selected_options.map do |option| selected_options.map do |option|
return "" if option.nil? return "" if option.nil?

4
lib/webrat/core/elements/link.rb
View File

@ -9,10 +9,6 @@ module Webrat
".//a[@href]" ".//a[@href]"
end end
def self.css_search
"a[@href]"
end
def click(options = {}) def click(options = {})
method = options[:method] || http_method method = options[:method] || http_method
return if href =~ /^#/ && method == :get return if href =~ /^#/ && method == :get

2
lib/webrat/core/locators/link_locator.rb
View File

@ -41,7 +41,7 @@ module Webrat
end end
def link_elements def link_elements
Webrat::XML.css_search(@dom, *Link.css_search) Webrat::XML.xpath_search(@dom, *Link.xpath_search)
end end
def replace_nbsp(str) def replace_nbsp(str)