xpath.rb in watir-6.15.0

- old
+ new
@@ -1,15 +1,44 @@
 module Watir
   module Locators
     class TextField
       class SelectorBuilder
         class XPath < Element::SelectorBuilder::XPath
-          def lhs_for(building, key)
-            if building == :input && key == :text
-              '@value'
+          def text_string
+            return super if @adjacent
+
+            @requires_matches[:text] = @selector.delete(:text) if @selector.key?(:text)
+            ''
+          end
+
+          def additional_string
+            return '' if @adjacent
+
+            type_string(@selector.delete(:type))
+          end
+
+          def tag_string
+            @selector[:tag_name] = 'input' unless @adjacent
+            super
+          end
+
+          def type_string(type)
+            if type.eql?(true)
+              "[#{negative_type_text}]"
+            elsif Watir::TextField::NON_TEXT_TYPES.include?(type)
+              msg = "TextField Elements can not be located by type: #{type}"
+              raise LocatorException, msg
+            elsif type.nil?
+              "[not(@type) or (#{negative_type_text})]"
             else
-              super
+              "[#{process_attribute(:type, type)}]"
             end
+          end
+
+          def negative_type_text
+            Watir::TextField::NON_TEXT_TYPES.map { |type|
+              "#{lhs_for(:type, true)}!=#{SelectorBuilder::XpathSupport.escape type}"
+            }.join(' and ')
           end
         end
       end
     end
   end