watir 7.1.0 → 7.2.0

data/lib/watir/elements/table_section.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   class TableSection < HTMLElement
     include RowContainer

data/lib/watir/elements/text_area.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   class TextArea < HTMLElement
     include UserEditable

data/lib/watir/elements/text_field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   class TextField < Input
     include UserEditable

data/lib/watir/exception.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Exception
     class Error < StandardError; end

data/lib/watir/extensions/nokogiri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 
 module Watir

data/lib/watir/generator/base/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class Base

data/lib/watir/generator/base/idl_sorter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tsort'
 
 module Watir
@@ -40,7 +42,7 @@ module Watir
           return if @visited.include?(node)
 
           @visited << node
-          puts ' ' * indent + node
+          puts (' ' * indent) + node
           tsort_each_child(node) { |child| print_node(child, indent + 2) }
         end
       end # IDLSorter

data/lib/watir/generator/base/spec_extractor.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class Base
       class SpecExtractor
-        IDL_SELECTOR = "//pre[contains(@class, 'idl')]".freeze
+        IDL_SELECTOR = "//pre[contains(@class, 'idl')]"
 
         class InterfaceNotFound < StandardError; end
 
@@ -32,9 +34,9 @@ module Watir
         def sorted_interfaces
           process if @interfaces.nil?
 
-          idl_sorter.sort.map { |name|
+          idl_sorter.sort.filter_map do |name|
             @interfaces.find { |i| i.name == name } || puts("ignoring interface: #{name}")
-          }.compact
+          end
         end
 
         def print_hierarchy
@@ -53,7 +55,7 @@ module Watir
         end
 
         def extract_idl_parts
-          parsed = @doc.search(IDL_SELECTOR).map { |e| parse_idl(e.inner_text) }.compact
+          parsed = @doc.search(IDL_SELECTOR).filter_map { |e| parse_idl(e.inner_text) }
 
           implements = []
           includes = []

data/lib/watir/generator/base/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     module Util

data/lib/watir/generator/base/visitor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class Base
@@ -9,7 +11,7 @@ module Watir
                         'DOMStringMap', 'HTMLPropertiesCollection', /HTML.*Element/, /HTML.*Collection/,
                         'CSSStyleDeclaration', /.+List$/, 'Date', 'Element', /DOM.+ReadOnly/,
                         /SVGAnimated.+/, /SVG.*Element/, /SVG.*Collection/, 'SVGViewSpec',
-                        'Object', 'USVString'].freeze
+                        'Object', 'USVString', 'DOMString', 'any'].freeze
         def initialize
           super
 
@@ -111,7 +113,8 @@ module Watir
 
         def ruby_type_for(type)
           case type.name.to_s
-          when 'DOMString', 'any'
+          when *STRING_TYPES
+            # probably completely wrong.
             String
           when 'UnsignedLong', 'Long', 'Integer', 'Short', 'UnsignedShort',
               'SVGAnimatedLength'
@@ -120,9 +123,6 @@ module Watir
             Float
           when 'Boolean'
             'Boolean'
-          when *STRING_TYPES
-            # probably completely wrong.
-            String
           else
             raise "unknown type: #{type.name}"
           end

data/lib/watir/generator/base.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'open-uri'
-require 'pp'
 require 'webidl'
 require 'active_support/inflector'
 

data/lib/watir/generator/html/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class HTML < Base

data/lib/watir/generator/html/spec_extractor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class HTML

data/lib/watir/generator/html/visitor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class HTML

data/lib/watir/generator/html.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.plural 'body', 'bodys'
   inflect.plural 'tbody', 'tbodys'

data/lib/watir/generator/svg/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class SVG < Base

data/lib/watir/generator/svg/spec_extractor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class SVG

data/lib/watir/generator/svg/visitor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Generator
     class SVG

data/lib/watir/generator/svg.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveSupport::Inflector.inflections do |inflect|
   inflect.plural 'defs', 'defss'
 end

data/lib/watir/generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'watir/generator/base'
 require 'watir/generator/html'
 require 'watir/generator/svg'

data/lib/watir/has_window.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module HasWindow
     attr_writer :original_window
@@ -27,7 +29,7 @@ module Watir
     def window(opts = {}, &blk)
       win = Window.new self, opts
 
-      win.use(&blk) if block_given?
+      win.use(&blk) if blk
 
       win
     end

data/lib/watir/http_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   class HttpClient < Selenium::WebDriver::Remote::Http::Default
     def request(verb, url, headers, payload, redirects = 0)

data/lib/watir/js_execution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module JSExecution
     #

data/lib/watir/js_snippets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module JSSnippets
     #

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Anchor

data/lib/watir/locators/button/matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Button

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Button
@@ -14,27 +16,23 @@ module Watir
             type = @selector.delete(:type)
             text = @selector.delete(:text)
 
-            string = "(#{button_string(text: text, type: type)})"
-            string << " or (#{input_string(text: text, type: type)})" unless type.eql?(false)
-            "[#{string}]"
+            button = "(#{button_string(text: text, type: type)})"
+            input = type.eql?(false) ? '' : " or (#{input_string(text: text, type: type)})"
+
+            "[#{button}#{input}]"
           end
 
           def button_string(text: nil, type: nil)
-            string = process_attribute(:tag_name, 'button')
-            string << " and #{process_attribute(:text, text)}" unless text.nil?
-            string << " and #{input_types(type)}" unless type.nil?
-            string
+            input = type.nil? ? '' : " and #{input_types(type)}"
+            attribute = text.nil? ? '' : " and #{process_attribute(:text, text)}"
+            "#{process_attribute(:tag_name, 'button')}#{input}#{attribute}"
           end
 
           def input_string(text: nil, type: nil)
-            string = process_attribute(:tag_name, 'input')
             type = nil if type.eql?(true)
-            string << " and (#{input_types(type)})"
-            if text
-              string << " and #{process_attribute(:value, text)}"
-              @built.delete(:value)
-            end
-            string
+            text_value = text.nil? ? '' : " and #{process_attribute(:value, text)}"
+            @built.delete(:value) unless text.nil?
+            "#{process_attribute(:tag_name, 'input')} and (#{input_types(type)})#{text_value}"
           end
 
           # value locator needs to match input value, button text or button value
@@ -54,17 +52,15 @@ module Watir
           def input_types(type = nil)
             types = if type.eql?(nil)
                       Watir::Button::VALID_TYPES
-                    elsif Watir::Button::VALID_TYPES.include?(type)
-                      [type]
-                    elsif type.eql?(true) || type.eql?(false)
+                    elsif Watir::Button::VALID_TYPES.include?(type) || type.eql?(true) || type.eql?(false)
                       [type]
                     else
                       msg = "Button Elements can not be located by input type: #{type}"
                       raise LocatorException, msg
                     end
-            types.map { |button_type|
+            types.filter_map { |button_type|
               predicate_expression(:type, button_type)
-            }.compact.join(' or ')
+            }.join(' or ')
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Button

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Cell

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Cell

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Element

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Element

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Source: https://github.com/teamcapybara/capybara/blob/xpath_regexp/lib/capybara/selector/regexp_disassembler.rb
 require 'regexp_parser'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Element
@@ -22,14 +24,14 @@ module Watir
             @adjacent = @selector.delete(:adjacent)
             @scope = @selector.delete(:scope)
 
-            xpath = start_string
-            xpath << adjacent_string
-            xpath << tag_string
-            xpath << class_string
-            xpath << text_string
-            xpath << additional_string
-            xpath << label_element_string
-            xpath << attribute_string
+            xpath = "#{start_string}" \
+                    "#{adjacent_string}" \
+                    "#{tag_string}" \
+                    "#{class_string}" \
+                    "#{text_string}" \
+                    "#{additional_string}" \
+                    "#{label_element_string}" \
+                    "#{attribute_string}"
 
             @built[:xpath] = index ? add_index(xpath, index) : xpath
             @built
@@ -73,7 +75,7 @@ module Watir
             add_to_matching(key, regexp, results)
 
             results.map { |rhs|
-              rhs = "'#{rhs}'"
+              rhs = "\"#{rhs}\""
               rhs = XpathSupport.downcase(rhs) if downcase
               "contains(#{lhs}, #{rhs})"
             }.flatten.compact.join(' and ')
@@ -112,7 +114,7 @@ module Watir
 
             @built[:class] = []
 
-            predicates = [class_name].flatten.map { |value| process_attribute(:class, value) }.compact
+            predicates = [class_name].flatten.filter_map { |value| process_attribute(:class, value) }
 
             @built.delete(:class) if @built[:class].empty?
 
@@ -135,7 +137,7 @@ module Watir
           end
 
           def equal_or_contains(value)
-            return nil if value.nil? || value.is_a?(String) && value.empty? || value.inspect == '//'
+            return nil if value.nil? || (value.is_a?(String) && value.empty?) || value.inspect == '//'
 
             process_attribute(:text, value)
           end
@@ -158,8 +160,7 @@ module Watir
             elsif index&.positive? && @built.empty?
               "(#{xpath})[#{index + 1}]"
             elsif index&.negative? && @built.empty?
-              last_value = 'last()'
-              last_value << (index + 1).to_s if index < -1
+              last_value = "last()#{index < -1 ? index + 1 : ''}"
               "(#{xpath})[#{last_value}]"
             else
               @built[:index] = index
@@ -220,7 +221,7 @@ module Watir
             if key == :class
               negate_xpath = value =~ /^!/
               value = value[1..] if negate_xpath
-              expression = "contains(concat(' ', @class, ' '), #{XpathSupport.escape " #{value} "})"
+              expression = "contains(concat(' ', normalize-space(@class), ' '), #{XpathSupport.escape " #{value} "})"
 
               negate_xpath ? "not(#{expression})" : expression
             else
@@ -254,7 +255,7 @@ module Watir
           end
 
           def process_string(name)
-            if name =~ /^[a-zA-Z_:][a-zA-Z0-9_:.\-]*$/
+            if /^[a-zA-Z_:][a-zA-Z0-9_:.-]*$/.match?(name)
               "@#{name}"
             else
               "(attribute::*[local-name(.) = '#{name}'])"

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Element
       class SelectorBuilder
         module XpathSupport
-          UPPERCASE_LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'.freeze
-          LOWERCASE_LETTERS = 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ'.freeze
+          UPPERCASE_LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'
+          LOWERCASE_LETTERS = 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ'
 
           def self.escape(value)
             if value.include? "'"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Element
@@ -22,6 +24,7 @@ module Watir
           @query_scope = query_scope
         end
 
+        # rubocop:disable Metrics/PerceivedComplexity:
         def build(selector)
           @selector = selector
 
@@ -29,13 +32,22 @@ module Watir
           inspected = selector.inspect
           scope = @query_scope unless @selector.key?(:scope) || @query_scope.is_a?(Watir::Browser)
 
-          @built = wd_locators.empty? ? build_wd_selector(@selector) : @selector
+          @built =
+            if scope.is_a? Watir::ShadowRoot
+              raise ArgumentError, ':xpath not supported when locating elements from shadow root' if @selector[:xpath]
+
+              @selector[:css] ||= '*'
+              @selector
+            else
+              wd_locators.empty? ? build_wd_selector(@selector) : @selector
+            end
           @built.delete(:index) if @built[:index]&.zero?
           @built[:scope] = scope if scope
 
           Watir.logger.info "Converted #{inspected} to #{@built.inspect}"
           @built
         end
+        # rubocop:enable Metrics/PerceivedComplexity:
 
         def wd_locators
           Watir::Locators::W3C_FINDERS & @selector.keys
@@ -66,9 +78,9 @@ module Watir
         end
 
         def merge_scope?
-          return false unless (Watir::Locators::W3C_FINDERS + [:adjacent] & @selector.keys).empty?
+          return false unless ((Watir::Locators::W3C_FINDERS + [:adjacent]) & @selector.keys).empty?
 
-          return false if [Watir::Browser, Watir::IFrame].any? { |k| @query_scope.is_a?(k) }
+          return false if [Watir::Browser, Watir::IFrame, Watir::ShadowRoot].any? { |k| @query_scope.is_a?(k) }
 
           scope_invalid_locators = @query_scope.selector_builder.built.keys.reject { |key| key == wd_locator }
           scope_invalid_locators.empty?
@@ -136,10 +148,8 @@ module Watir
           keys.reject! { |key| %i[visible visible_text index].include? key }
           if (keys - [:tag_name]).empty?
             true
-          elsif selector[:tag_name] == 'input' && keys == %i[tag_name type]
-            true
           else
-            false
+            selector[:tag_name] == 'input' && keys == %i[tag_name type]
           end
         end
 

data/lib/watir/locators/option/matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Option

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Option

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Option

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Row

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class Row

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class TextArea

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class TextArea

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class TextField

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class TextField

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Locators
     class TextField

data/lib/watir/locators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'watir/locators/element/locator'
 require 'watir/locators/element/selector_builder'
 require 'watir/locators/element/selector_builder/xpath_support'

data/lib/watir/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 require 'logger'
 

data/lib/watir/navigation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module Navigation
     #
@@ -11,7 +13,7 @@ module Watir
     #
 
     def goto(uri)
-      uri = "http://#{uri}" unless uri =~ URI::DEFAULT_PARSER.make_regexp
+      uri = "http://#{uri}" unless uri&.match?(URI::DEFAULT_PARSER.make_regexp)
 
       @driver.navigate.to uri
       @after_hooks.run

data/lib/watir/radio_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   class RadioSet
     extend Forwardable

data/lib/watir/row_container.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   module RowContainer
     #

data/lib/watir/screenshot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Watir
   class Screenshot
     def initialize(browser)