watir 6.10.0 → 6.10.1

data/lib/watir/locators/element/selector_builder/xpath.rb

@@ -1,119 +1,119 @@
-module Watir
-  module Locators
-    class Element
-      class SelectorBuilder
-        class XPath
-          def initialize(should_use_label_element)
-            @should_use_label_element = should_use_label_element
-          end
-
-          def build(selectors)
-            adjacent = selectors.delete :adjacent
-            xpath = adjacent ? process_adjacent(adjacent) : ".//"
-
-            xpath << (selectors.delete(:tag_name) || '*').to_s
-
-            index = selectors.delete(:index)
-
-            # the remaining entries should be attributes
-            unless selectors.empty?
-              xpath << "[" << attribute_expression(nil, selectors) << "]"
-            end
-
-            xpath << "[#{index + 1}]" if adjacent && index
-
-            p xpath: xpath, selectors: selectors if $DEBUG
-
-            [:xpath, xpath]
-          end
-
-          # @todo Get rid of building
-          def attribute_expression(building, selectors)
-            f = selectors.map do |key, val|
-              if val.is_a?(Array) && key == :class
-                "(" + val.map { |v| build_class_match(v) }.join(" and ") + ")"
-              elsif val.is_a?(Array)
-                "(" + val.map { |v| equal_pair(building, key, v) }.join(" or ") + ")"
-              elsif val == true
-                attribute_presence(key)
-              elsif val == false
-                attribute_absence(key)
-              else
-                equal_pair(building, key, val)
-              end
-            end
-            f.join(" and ")
-          end
-
-          # @todo Get rid of building
-          def equal_pair(building, key, value)
-            if key == :class
-              if value.strip.include?(' ')
-                Watir.logger.deprecate "Using the :class locator to locate multiple classes with a String value", "Array"
-              end
-              build_class_match(value)
-            elsif key == :label && @should_use_label_element
-              # we assume :label means a corresponding label element, not the attribute
-              text = "normalize-space()=#{XpathSupport.escape value}"
-              "(@id=//label[#{text}]/@for or parent::label[#{text}])"
-            else
-              "#{lhs_for(building, key)}=#{XpathSupport.escape value}"
-            end
-          end
-
-          # @todo Get rid of building
-          def lhs_for(_building, key)
-            case key
-            when :text, 'text'
-              'normalize-space()'
-            when :href
-              # TODO: change this behaviour?
-              'normalize-space(@href)'
-            when :type
-              # type attributes can be upper case - downcase them
-              # https://github.com/watir/watir/issues/72
-              XpathSupport.downcase('@type')
-            else
-              "@#{key.to_s.tr("_", "-")}"
-            end
-          end
-
-          private
-
-          def process_adjacent(adjacent)
-            xpath = './'
-            xpath << case adjacent
-                     when :ancestor
-                       "ancestor::"
-                     when :preceding
-                       "preceding-sibling::"
-                     when :following
-                       "following-sibling::"
-                     when :child
-                       "child::"
-                     end
-            xpath
-          end
-
-          def build_class_match(value)
-            if value.match(/^!/)
-              klass = XpathSupport.escape " #{value[1..-1]} "
-              "not(contains(concat(' ', @class, ' '), #{klass}))"
-            else
-              klass = XpathSupport.escape " #{value} "
-              "contains(concat(' ', @class, ' '), #{klass})"
-            end
-          end
-
-          def attribute_presence(attribute)
-            lhs_for(nil, attribute)
-          end
-
-          def attribute_absence(attribute)
-            "not(#{lhs_for(nil, attribute)})"
-          end
-        end
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class Element
+      class SelectorBuilder
+        class XPath
+          def initialize(should_use_label_element)
+            @should_use_label_element = should_use_label_element
+          end
+
+          def build(selectors)
+            adjacent = selectors.delete :adjacent
+            xpath = adjacent ? process_adjacent(adjacent) : ".//"
+
+            xpath << (selectors.delete(:tag_name) || '*').to_s
+
+            index = selectors.delete(:index)
+
+            # the remaining entries should be attributes
+            unless selectors.empty?
+              xpath << "[" << attribute_expression(nil, selectors) << "]"
+            end
+
+            xpath << "[#{index + 1}]" if adjacent && index
+
+            p xpath: xpath, selectors: selectors if $DEBUG
+
+            [:xpath, xpath]
+          end
+
+          # @todo Get rid of building
+          def attribute_expression(building, selectors)
+            f = selectors.map do |key, val|
+              if val.is_a?(Array) && key == :class
+                "(" + val.map { |v| build_class_match(v) }.join(" and ") + ")"
+              elsif val.is_a?(Array)
+                "(" + val.map { |v| equal_pair(building, key, v) }.join(" or ") + ")"
+              elsif val == true
+                attribute_presence(key)
+              elsif val == false
+                attribute_absence(key)
+              else
+                equal_pair(building, key, val)
+              end
+            end
+            f.join(" and ")
+          end
+
+          # @todo Get rid of building
+          def equal_pair(building, key, value)
+            if key == :class
+              if value.strip.include?(' ')
+                Watir.logger.deprecate "Using the :class locator to locate multiple classes with a String value", "Array"
+              end
+              build_class_match(value)
+            elsif key == :label && @should_use_label_element
+              # we assume :label means a corresponding label element, not the attribute
+              text = "normalize-space()=#{XpathSupport.escape value}"
+              "(@id=//label[#{text}]/@for or parent::label[#{text}])"
+            else
+              "#{lhs_for(building, key)}=#{XpathSupport.escape value}"
+            end
+          end
+
+          # @todo Get rid of building
+          def lhs_for(_building, key)
+            case key
+            when :text, 'text'
+              'normalize-space()'
+            when :href
+              # TODO: change this behaviour?
+              'normalize-space(@href)'
+            when :type
+              # type attributes can be upper case - downcase them
+              # https://github.com/watir/watir/issues/72
+              XpathSupport.downcase('@type')
+            else
+              "@#{key.to_s.tr("_", "-")}"
+            end
+          end
+
+          private
+
+          def process_adjacent(adjacent)
+            xpath = './'
+            xpath << case adjacent
+                     when :ancestor
+                       "ancestor::"
+                     when :preceding
+                       "preceding-sibling::"
+                     when :following
+                       "following-sibling::"
+                     when :child
+                       "child::"
+                     end
+            xpath
+          end
+
+          def build_class_match(value)
+            if value.match(/^!/)
+              klass = XpathSupport.escape " #{value[1..-1]} "
+              "not(contains(concat(' ', @class, ' '), #{klass}))"
+            else
+              klass = XpathSupport.escape " #{value} "
+              "contains(concat(' ', @class, ' '), #{klass})"
+            end
+          end
+
+          def attribute_presence(attribute)
+            lhs_for(nil, attribute)
+          end
+
+          def attribute_absence(attribute)
+            "not(#{lhs_for(nil, attribute)})"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watir/locators/element/validator.rb

@@ -1,18 +1,18 @@
-module Watir
-  module Locators
-    class Element
-      class Validator
-        def validate(element, selector)
-          selector_tag_name = selector[:tag_name]
-          element_tag_name = element.tag_name.downcase
-
-          if selector_tag_name
-            return unless selector_tag_name === element_tag_name
-          end
-
-          element
-        end
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class Element
+      class Validator
+        def validate(element, selector)
+          selector_tag_name = selector[:tag_name]
+          element_tag_name = element.tag_name.downcase
+
+          if selector_tag_name
+            return unless selector_tag_name === element_tag_name
+          end
+
+          element
+        end
+      end
+    end
+  end
+end

data/lib/watir/locators/row/locator.rb

@@ -1,15 +1,15 @@
-module Watir
-  module Locators
-    class Row
-      class Locator < Element::Locator
-
-        private
-
-        def using_selenium(*)
-          # force Watir usage
-        end
-
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class Row
+      class Locator < Element::Locator
+
+        private
+
+        def using_selenium(*)
+          # force Watir usage
+        end
+
+      end
+    end
+  end
+end

data/lib/watir/locators/row/selector_builder.rb

@@ -1,29 +1,29 @@
-module Watir
-  module Locators
-    class Row
-      class SelectorBuilder < Element::SelectorBuilder
-        def build_wd_selector(selectors)
-          return if selectors.values.any? { |e| e.kind_of? Regexp }
-          selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
-
-          expressions = %w[./tr]
-          unless %w[tbody tfoot thead].include?(@query_scope.tag_name.downcase)
-            expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr]
-          end
-
-          attr_expr = xpath_builder.attribute_expression(nil, selectors)
-
-          unless attr_expr.empty?
-            expressions.map! { |e| "#{e}[#{attr_expr}]" }
-          end
-
-          xpath = expressions.join(" | ")
-
-          p build_wd_selector: xpath if $DEBUG
-
-          [:xpath, xpath]
-        end
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class Row
+      class SelectorBuilder < Element::SelectorBuilder
+        def build_wd_selector(selectors)
+          return if selectors.values.any? { |e| e.kind_of? Regexp }
+          selectors.delete(:tag_name) || raise("internal error: no tag_name?!")
+
+          expressions = %w[./tr]
+          unless %w[tbody tfoot thead].include?(@query_scope.tag_name.downcase)
+            expressions += %w[./tbody/tr ./thead/tr ./tfoot/tr]
+          end
+
+          attr_expr = xpath_builder.attribute_expression(nil, selectors)
+
+          unless attr_expr.empty?
+            expressions.map! { |e| "#{e}[#{attr_expr}]" }
+          end
+
+          xpath = expressions.join(" | ")
+
+          p build_wd_selector: xpath if $DEBUG
+
+          [:xpath, xpath]
+        end
+      end
+    end
+  end
+end

data/lib/watir/locators/text_area/locator.rb

@@ -1,13 +1,13 @@
-module Watir
-  module Locators
-    class TextArea
-      class Locator < Element::Locator
-        private
-
-        def can_convert_regexp_to_contains?
-          false
-        end
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class TextArea
+      class Locator < Element::Locator
+        private
+
+        def can_convert_regexp_to_contains?
+          false
+        end
+      end
+    end
+  end
+end

data/lib/watir/locators/text_area/selector_builder.rb

@@ -1,22 +1,22 @@
-module Watir
-  module Locators
-    class TextArea
-      class SelectorBuilder < Element::SelectorBuilder
-        private
-
-        def normalize_selector(how, what)
-          # We need to iterate through located elements and fetch
-          # attribute value using Selenium because XPath doesn't understand
-          # difference between IDL vs content attribute.
-          # Current Element design doesn't allow to do that in any
-          # obvious way except to use regular expression.
-          if how == :value && what.kind_of?(String)
-            [how, Regexp.new('^' + Regexp.escape(what) + '$')]
-          else
-            super
-          end
-        end
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class TextArea
+      class SelectorBuilder < Element::SelectorBuilder
+        private
+
+        def normalize_selector(how, what)
+          # We need to iterate through located elements and fetch
+          # attribute value using Selenium because XPath doesn't understand
+          # difference between IDL vs content attribute.
+          # Current Element design doesn't allow to do that in any
+          # obvious way except to use regular expression.
+          if how == :value && what.kind_of?(String)
+            [how, Regexp.new('^' + Regexp.escape(what) + '$')]
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watir/locators/text_field/locator.rb

@@ -1,30 +1,30 @@
-module Watir
-  module Locators
-    class TextField
-      class Locator < Element::Locator
-
-        private
-
-        def using_selenium(*)
-          # force Watir usage
-        end
-
-        def matches_selector?(element, rx_selector)
-          rx_selector = rx_selector.dup
-
-          tag_name = element.tag_name.downcase
-
-          [:text, :value, :label].each do |key|
-            if rx_selector.key?(key)
-              correct_key = tag_name == 'input' ? :value : :text
-              rx_selector[correct_key] = rx_selector.delete(key)
-            end
-          end
-
-          super
-        end
-
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class TextField
+      class Locator < Element::Locator
+
+        private
+
+        def using_selenium(*)
+          # force Watir usage
+        end
+
+        def matches_selector?(element, rx_selector)
+          rx_selector = rx_selector.dup
+
+          tag_name = element.tag_name.downcase
+
+          [:text, :value, :label].each do |key|
+            if rx_selector.key?(key)
+              correct_key = tag_name == 'input' ? :value : :text
+              rx_selector[correct_key] = rx_selector.delete(key)
+            end
+          end
+
+          super
+        end
+
+      end
+    end
+  end
+end