lib/watir/locators/text_field/selector_builder.rb in watir-6.13.0 vs lib/watir/locators/text_field/selector_builder.rb in watir-6.14.0

- old
+ new

@@ -1,30 +1,30 @@ module Watir module Locators class TextField class SelectorBuilder < Element::SelectorBuilder def build_wd_selector(selectors) - return if selectors.values.any? { |e| e.kind_of? Regexp } + return if selectors.values.any? { |e| e.is_a? Regexp } selectors.delete(:tag_name) input_attr_exp = xpath_builder.attribute_expression(:input, selectors) xpath = ".//input[(not(@type) or (#{negative_type_expr}))" xpath << " and #{input_attr_exp}" unless input_attr_exp.empty? - xpath << "]" + xpath << ']' p build_wd_selector: xpath if $DEBUG [:xpath, xpath] end private def negative_type_expr - Watir::TextField::NON_TEXT_TYPES.map do |type| - "%s!=%s" % [XpathSupport.downcase('@type'), type.inspect] - end.join(' and ') + Watir::TextField::NON_TEXT_TYPES.map { |type| + format('%s!=%s', XpathSupport.downcase('@type'), type.inspect) + }.join(' and ') end end end end end