watir 6.13.0 → 6.14.0

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

@@ -1,21 +1,21 @@
 module Watir
   module Generator
-    class HTML::Visitor < Base::Visitor
+    module HTML
+      class Visitor < Base::Visitor
+        def classify_regexp
+          /^HTML(.+)Element$/
+        end
 
-      def classify_regexp
-        /^HTML(.+)Element$/
-      end
+        private
 
-      private
+        def interface_regexp
+          /^HTML/
+        end
 
-      def interface_regexp
-        /^HTML/
-      end
-
-      def force_inheritance
-        { 'HTMLElement' => 'Element' }
-      end
-
-    end # HTML::Visitor
+        def force_inheritance
+          {'HTMLElement' => 'Element'}
+        end
+      end # Visitor
+    end # HTML
   end # Generator
 end # Watir

data/lib/watir/generator/svg.rb

@@ -2,6 +2,6 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.plural 'defs', 'defss'
 end
 
-require "watir/generator/svg/generator"
-require "watir/generator/svg/spec_extractor"
-require "watir/generator/svg/visitor"
+require 'watir/generator/svg/generator'
+require 'watir/generator/svg/spec_extractor'
+require 'watir/generator/svg/visitor'

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

@@ -1,7 +1,6 @@
 module Watir
   module Generator
     class SVG < Base
-
       private
 
       # fix collisions with HTML
@@ -10,7 +9,7 @@ module Watir
       # are inherited from HTML ones
 
       def ignored_tags
-        %w(a audio canvas iframe image script source style text title track video unknown)
+        %w[a audio canvas iframe image script source style text title track video unknown]
       end
 
       def ignored_interfaces
@@ -32,7 +31,6 @@ module Watir
       def extractor_class
         SVG::SpecExtractor
       end
-
     end # SVG
   end # Generator
 end # Watir

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

@@ -1,53 +1,53 @@
 module Watir
   module Generator
-    class SVG::SpecExtractor < Base::SpecExtractor
+    module SVG
+      class SpecExtractor < Base::SpecExtractor
+        private
 
-      private
+        def extract_interface_map
+          list = @doc.search("//div[@id='chapter-eltindex']//ul/li")
+          list.any? || raise('could not find elements list')
 
-      def extract_interface_map
-        list = @doc.search("//div[@id='chapter-eltindex']//ul/li")
-        list.any? or raise 'could not find elements list'
-
-        @interface_map = parse_list(list)
-      end
+          @interface_map = parse_list(list)
+        end
 
-      def build_result
-        {}.tap do |result|
-          @interface_map.each do |tag, interface|
-            result[tag] = fetch_interface(interface)
+        def build_result
+          {}.tap do |result|
+            @interface_map.each do |tag, interface|
+              result[tag] = fetch_interface(interface)
+            end
           end
         end
-      end
 
-      def parse_list(list)
-        {}.tap do |result|
-          list.each do |node|
-            tag_name = node.css('a span').inner_text.strip
-            id = node.css('a').attr('href').to_s
+        def parse_list(list)
+          {}.tap do |result|
+            list.each do |node|
+              tag_name = node.css('a span').inner_text.strip
+              id = node.css('a').attr('href').to_s
 
-            next if external_interface?(id)
+              next if external_interface?(id)
 
-            interface_css = 'div.element-summary a.idlinterface'
-            interface_definitions = @doc.css("#{id} #{interface_css}, #{id} ~ #{interface_css}")
+              interface_css = 'div.element-summary a.idlinterface'
+              interface_definitions = @doc.css("#{id} #{interface_css}, #{id} ~ #{interface_css}")
 
-            # TSpan is defined along with Text so the first IDL definition is SVGTextElement
-            idx = tag_name == 'tspan' ? 1 : 0
+              # TSpan is defined along with Text so the first IDL definition is SVGTextElement
+              idx = tag_name == 'tspan' ? 1 : 0
 
-            result[tag_name] = interface_definitions[idx].inner_text.strip
+              result[tag_name] = interface_definitions[idx].inner_text.strip
+            end
           end
         end
-      end
-
-      def issued_interfaces
-        %w(SVGHatchElement SVGHatchPathElement SVGSolidColorElement)
-      end
 
-      # Some interfaces are actually defined in different specs
-      # (for example, clipPath), so we ignore them for now.
-      def external_interface?(id)
-        id !~ /^#.+/
-      end
+        def issued_interfaces
+          []
+        end
 
-    end # SVG::SpecExtractor
+        # Some interfaces are actually defined in different specs
+        # (for example, clipPath), so we ignore them for now.
+        def external_interface?(id)
+          id !~ /^#.+/
+        end
+      end # SpecExtractor
+    end # SVG
   end # Generator
 end # Watir

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

@@ -1,21 +1,21 @@
 module Watir
   module Generator
-    class SVG::Visitor < Base::Visitor
+    module SVG
+      class Visitor < Base::Visitor
+        def classify_regexp
+          /^SVG(.+)Element$/
+        end
 
-      def classify_regexp
-        /^SVG(.+)Element$/
-      end
+        private
 
-      private
+        def interface_regexp
+          /^SVG.*Element$/
+        end
 
-      def interface_regexp
-        /^SVG.*Element$/
-      end
-
-      def force_inheritance
-        { 'SVGElement' => 'HTMLElement' }
-      end
-
-    end # SVG::Visitor
+        def force_inheritance
+          {'SVGElement' => 'HTMLElement'}
+        end
+      end # Visitor
+    end # SVG
   end # Generator
 end # Watir

data/lib/watir/has_window.rb

@@ -1,6 +1,5 @@
 module Watir
   module HasWindow
-
     #
     # Returns browser windows array.
     #
@@ -55,14 +54,13 @@ module Watir
     private
 
     def filter_windows(selector, windows)
-      unless selector.keys.all? { |k| [:title, :url].include? k }
+      unless selector.keys.all? { |k| %i[title url].include? k }
         raise ArgumentError, "invalid window selector: #{selector.inspect}"
       end
 
       windows.select do |win|
-        selector.all? { |key, value| value === win.send(key) }
+        selector.all? { |key, value| win.send(key) =~ /#{value}/ }
       end
     end
-
   end # HasWindow
 end # Watir

data/lib/watir/js_execution.rb

@@ -1,6 +1,5 @@
 module Watir
   module JSExecution
-
     #
     # Delegates script execution to Browser or IFrame.
     #
@@ -50,14 +49,14 @@ module Watir
 
     def flash(preset = :default, color: 'red', flashes: 10, delay: 0.1)
       presets = {
-          fast: { delay: 0.04 },
-          slow: { delay: 0.2 },
-          long: { flashes: 5, delay: 0.5 },
-          rainbow: { flashes: 5, color: %w(red orange yellow green blue indigo violet) }
+        fast: {delay: 0.04},
+        slow: {delay: 0.2},
+        long: {flashes: 5, delay: 0.5},
+        rainbow: {flashes: 5, color: %w[red orange yellow green blue indigo violet]}
       }
-      return self.flash(presets[preset]) unless presets[preset].nil?
+      return flash(presets[preset]) unless presets[preset].nil?
 
-      background_color = original_color = style("background-color")
+      background_color = original_color = style('background-color')
       background_color = 'white' if background_color.empty?
       colors = Array(color).push(background_color)
 
@@ -123,7 +122,7 @@ module Watir
     def outer_html
       element_call { execute_js(:getOuterHtml, @element) }.strip
     end
-    alias_method :html, :outer_html
+    alias html outer_html
 
     #
     # Returns text content of element.
@@ -149,6 +148,5 @@ module Watir
     def select_text(str)
       element_call { execute_js :selectText, @element, str }
     end
-
   end # JSExecution
 end # Watir

data/lib/watir/js_snippets.rb

@@ -1,7 +1,8 @@
 module Watir
   module JSSnippets
-
-    private
+    #
+    # @api private
+    #
 
     def execute_js(function_name, *arguments)
       file = File.expand_path("../js_snippets/#{function_name}.js", __FILE__)
@@ -11,6 +12,5 @@ module Watir
       script = "return (#{js}).apply(null, arguments)"
       @query_scope.execute_script(script, *arguments)
     end
-
   end # JSSnippets
 end # Watir

data/lib/watir/js_snippets/attributeValues.js

@@ -0,0 +1,11 @@
+// Original Author: Justin Ko
+// Source: https://stackoverflow.com/questions/12485833/how-do-i-retrieve-list-of-element-attributes-using-watir-webdriver
+function() {
+    var s = {};
+    var attrs = arguments[0].attributes;
+    for (var l = 0; l < attrs.length; ++l) {
+        var a = attrs[l];
+        s[a.name] = a.value.trim();
+    }
+    return s;
+}

data/lib/watir/legacy_wait.rb

@@ -1,8 +1,7 @@
 require 'forwardable'
 
-# TODO - remove this file for future release
+# TODO: - remove this file for future release
 module Watir
-
   class BaseDecorator
     def initialize(element, timeout, message = nil)
       @element = element
@@ -10,18 +9,16 @@ module Watir
       @message = message
     end
 
-    def respond_to?(*args)
+    def respond_to_missing?(*args)
       @element.respond_to?(*args)
     end
 
-    def method_missing(m, *args, &block)
-      unless @element.respond_to?(m)
-        raise NoMethodError, "undefined method `#{m}' for #{@element.inspect}:#{@element.class}"
-      end
+    def method_missing(method, *args, &block)
+      return super unless @element.respond_to?(method)
 
       Watir::Wait.until(@timeout, @message) { wait_until }
 
-      @element.__send__(m, *args, &block)
+      @element.__send__(method, *args, &block)
     end
   end
 
@@ -51,7 +48,6 @@ module Watir
   #
 
   class WhenEnabledDecorator < BaseDecorator
-
     private
 
     def wait_until
@@ -83,7 +79,7 @@ module Watir
     def when_present(timeout = nil)
       warning = '#when_present has been deprecated and is unlikely to be needed; '
       warning << 'replace this with #wait_until_present if a wait is still needed'
-      Watir.logger.warn warning, ids: [:when_present, :deprecations]
+      Watir.logger.warn warning, ids: %i[when_present deprecations]
 
       timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to become present"
@@ -110,7 +106,7 @@ module Watir
 
     def when_enabled(timeout = nil)
       Watir.logger.warn '#when_enabled has been deprecated and is unlikely to be needed',
-                        ids: [:when_enabled, :deprecations]
+                        ids: %i[when_enabled deprecations]
 
       timeout ||= Watir.default_timeout
       message = "waiting for #{selector_string} to become enabled"
@@ -122,6 +118,5 @@ module Watir
         WhenEnabledDecorator.new(self, timeout, message)
       end
     end
-
   end # EventuallyPresent
 end # Watir

data/lib/watir/locators.rb

@@ -27,23 +27,23 @@ module Watir
     module ClassHelpers
       def locator_class
         class_from_string("#{browser.locator_namespace}::#{element_class_name}::Locator") ||
-            class_from_string("Watir::Locators::#{element_class_name}::Locator") ||
-            class_from_string("#{browser.locator_namespace}::Element::Locator") ||
-            Watir::Locators::Element::Locator
+          class_from_string("Watir::Locators::#{element_class_name}::Locator") ||
+          class_from_string("#{browser.locator_namespace}::Element::Locator") ||
+          Watir::Locators::Element::Locator
       end
 
       def element_validator_class
         class_from_string("#{browser.locator_namespace}::#{element_class_name}::Validator") ||
-            class_from_string("Watir::Locators::#{element_class_name}::Validator") ||
-            class_from_string("#{browser.locator_namespace}::Element::Validator") ||
-            Watir::Locators::Element::Validator
+          class_from_string("Watir::Locators::#{element_class_name}::Validator") ||
+          class_from_string("#{browser.locator_namespace}::Element::Validator") ||
+          Watir::Locators::Element::Validator
       end
 
       def selector_builder_class
         class_from_string("#{browser.locator_namespace}::#{element_class_name}::SelectorBuilder") ||
-            class_from_string("Watir::Locators::#{element_class_name}::SelectorBuilder") ||
-            class_from_string("#{browser.locator_namespace}::Element::SelectorBuilder") ||
-            Watir::Locators::Element::SelectorBuilder
+          class_from_string("Watir::Locators::#{element_class_name}::SelectorBuilder") ||
+          class_from_string("#{browser.locator_namespace}::Element::SelectorBuilder") ||
+          Watir::Locators::Element::SelectorBuilder
       end
 
       def class_from_string(string)
@@ -57,8 +57,6 @@ module Watir
       end
 
       def build_locator
-        @query_scope.send :ensure_context
-
         element_validator = element_validator_class.new
         selector_builder = selector_builder_class.new(@query_scope, @selector.dup, element_class.attribute_list)
         locator_class.new(@query_scope, @selector.dup, selector_builder, element_validator)

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

@@ -2,8 +2,6 @@ module Watir
   module Locators
     class Button
       class Locator < Element::Locator
-
-
         private
 
         def using_selenium(*)
@@ -20,7 +18,8 @@ module Watir
             copy  = selector.dup
             value = copy.delete(:value)
 
-            super(element, copy) && (value === fetch_value(element, :value) || value === fetch_value(element, :text))
+            super(element, copy) &&
+              (fetch_value(element, :value) =~ /#{value}/ || fetch_value(element, :text) =~ /#{value}/)
           else
             super
           end

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

@@ -3,23 +3,23 @@ module Watir
     class Button
       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) || raise("internal error: no tag_name?!")
+          selectors.delete(:tag_name) || raise('internal error: no tag_name?!')
 
           button_attr_exp = xpath_builder.attribute_expression(:button, selectors)
-          
-          xpath = ".//button"
+
+          xpath = './/button'
           xpath << "[#{button_attr_exp}]" unless button_attr_exp.empty?
-          
-          unless selectors[:type] == false
+
+          unless selectors[:type].eql? false
             selectors[:type] = Watir::Button::VALID_TYPES if [nil, true].include?(selectors[:type])
             input_attr_exp = xpath_builder.attribute_expression(:input, selectors)
-            
-            xpath << " | .//input"
+
+            xpath << ' | .//input'
             xpath << "[#{input_attr_exp}]"
           end
-          
+
           p build_wd_selector: xpath if $DEBUG
 
           [:xpath, xpath]