watir 6.10.0 → 6.10.1

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

@@ -1,31 +1,31 @@
-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 }
-
-          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 << "]"
-
-          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 ')
-        end
-      end
-    end
-  end
-end
+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 }
+
+          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 << "]"
+
+          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 ')
+        end
+      end
+    end
+  end
+end

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

@@ -1,17 +1,17 @@
-module Watir
-  module Locators
-    class TextField
-      class SelectorBuilder
-        class XPath < Element::SelectorBuilder::XPath
-          def lhs_for(building, key)
-            if building == :input && key == :text
-              "@value"
-            else
-              super
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class TextField
+      class SelectorBuilder
+        class XPath < Element::SelectorBuilder::XPath
+          def lhs_for(building, key)
+            if building == :input && key == :text
+              "@value"
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,12 @@
-module Watir
-  module Locators
-    class TextField
-      class Validator < Element::Validator
-        def validate(element, selector)
-          return unless element.tag_name.downcase == 'input'
-          element
-        end
-      end
-    end
-  end
-end
+module Watir
+  module Locators
+    class TextField
+      class Validator < Element::Validator
+        def validate(element, selector)
+          return unless element.tag_name.downcase == 'input'
+          element
+        end
+      end
+    end
+  end
+end

data/lib/watir/logger.rb

@@ -1,109 +1,109 @@
-require 'forwardable'
-require 'logger'
-
-# Code adapted from Selenium Implementation
-# https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/common/logger.rb
-
-module Watir
-  #
-  # @example Enable full logging
-  #   Watir.logger.level = :debug
-  #
-  # @example Log to file
-  #   Watir.logger.output = 'watir.log'
-  #
-  # @example Use logger manually
-  #   Watir.logger.info('This is info message')
-  #   Watir.logger.warn('This is warning message')
-  #
-  class Logger
-    extend Forwardable
-    include ::Logger::Severity
-
-    def_delegators :@logger, :debug, :debug?,
-                   :info, :info?,
-                   :warn, :warn?,
-                   :error, :error?,
-                   :fatal, :fatal?,
-                   :level
-
-    def initialize
-      @logger = create_logger($stdout)
-    end
-
-    def output=(io)
-      # `Logger#reopen` was added in Ruby 2.3
-      if @logger.respond_to?(:reopen)
-        @logger.reopen(io)
-      else
-        @logger = create_logger(io)
-      end
-    end
-
-    #
-    # For Ruby < 2.3 compatibility
-    # Based on https://github.com/ruby/ruby/blob/ruby_2_3/lib/logger.rb#L250
-    #
-
-    def level=(severity)
-      if severity.is_a?(Integer)
-        @logger.level = severity
-      else
-        case severity.to_s.downcase
-        when 'debug'.freeze
-          @logger.level = DEBUG
-        when 'info'.freeze
-          @logger.level = INFO
-        when 'warn'.freeze
-          @logger.level = WARN
-        when 'error'.freeze
-          @logger.level = ERROR
-        when 'fatal'.freeze
-          @logger.level = FATAL
-        when 'unknown'.freeze
-          @logger.level = UNKNOWN
-        else
-          raise ArgumentError, "invalid log level: #{severity}"
-        end
-      end
-    end
-
-    #
-    # Returns IO object used by logger internally.
-    #
-    # Normally, we would have never needed it, but we want to
-    # use it as IO object for all child processes to ensure their
-    # output is redirected there.
-    #
-    # It is only used in debug level, in other cases output is suppressed.
-    #
-    # @api private
-    #
-    def io
-      @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
-    end
-
-    #
-    # Marks code as deprecated with replacement.
-    #
-    # @param [String] old
-    # @param [String] new
-    #
-    def deprecate(old, new)
-      warn "[DEPRECATION] #{old} is deprecated. Use #{new} instead."
-    end
-
-    private
-
-    def create_logger(output)
-      logger = ::Logger.new(output)
-      logger.progname = 'Watir'
-      logger.level = ($DEBUG ? DEBUG : WARN)
-      logger.formatter = proc do |severity, time, progname, msg|
-        "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
-      end
-
-      logger
-    end
-  end
-end
+require 'forwardable'
+require 'logger'
+
+# Code adapted from Selenium Implementation
+# https://github.com/SeleniumHQ/selenium/blob/master/rb/lib/selenium/webdriver/common/logger.rb
+
+module Watir
+  #
+  # @example Enable full logging
+  #   Watir.logger.level = :debug
+  #
+  # @example Log to file
+  #   Watir.logger.output = 'watir.log'
+  #
+  # @example Use logger manually
+  #   Watir.logger.info('This is info message')
+  #   Watir.logger.warn('This is warning message')
+  #
+  class Logger
+    extend Forwardable
+    include ::Logger::Severity
+
+    def_delegators :@logger, :debug, :debug?,
+                   :info, :info?,
+                   :warn, :warn?,
+                   :error, :error?,
+                   :fatal, :fatal?,
+                   :level
+
+    def initialize
+      @logger = create_logger($stdout)
+    end
+
+    def output=(io)
+      # `Logger#reopen` was added in Ruby 2.3
+      if @logger.respond_to?(:reopen)
+        @logger.reopen(io)
+      else
+        @logger = create_logger(io)
+      end
+    end
+
+    #
+    # For Ruby < 2.3 compatibility
+    # Based on https://github.com/ruby/ruby/blob/ruby_2_3/lib/logger.rb#L250
+    #
+
+    def level=(severity)
+      if severity.is_a?(Integer)
+        @logger.level = severity
+      else
+        case severity.to_s.downcase
+        when 'debug'.freeze
+          @logger.level = DEBUG
+        when 'info'.freeze
+          @logger.level = INFO
+        when 'warn'.freeze
+          @logger.level = WARN
+        when 'error'.freeze
+          @logger.level = ERROR
+        when 'fatal'.freeze
+          @logger.level = FATAL
+        when 'unknown'.freeze
+          @logger.level = UNKNOWN
+        else
+          raise ArgumentError, "invalid log level: #{severity}"
+        end
+      end
+    end
+
+    #
+    # Returns IO object used by logger internally.
+    #
+    # Normally, we would have never needed it, but we want to
+    # use it as IO object for all child processes to ensure their
+    # output is redirected there.
+    #
+    # It is only used in debug level, in other cases output is suppressed.
+    #
+    # @api private
+    #
+    def io
+      @logger.instance_variable_get(:@logdev).instance_variable_get(:@dev)
+    end
+
+    #
+    # Marks code as deprecated with replacement.
+    #
+    # @param [String] old
+    # @param [String] new
+    #
+    def deprecate(old, new)
+      warn "[DEPRECATION] #{old} is deprecated. Use #{new} instead."
+    end
+
+    private
+
+    def create_logger(output)
+      logger = ::Logger.new(output)
+      logger.progname = 'Watir'
+      logger.level = ($DEBUG ? DEBUG : WARN)
+      logger.formatter = proc do |severity, time, progname, msg|
+        "#{time.strftime('%F %T')} #{severity} #{progname} #{msg}\n"
+      end
+
+      logger
+    end
+  end
+end

data/lib/watir/radio_set.rb

@@ -1,231 +1,231 @@
-module Watir
-  class RadioSet
-    extend Forwardable
-    include Watir::Exception
-    include Enumerable
-
-    delegate [:exists?, :present?, :visible?, :browser] => :source
-
-    attr_reader :source, :frame
-
-    def initialize(query_scope, selector)
-      unless selector.kind_of? Hash
-        raise ArgumentError, "invalid argument: #{selector.inspect}"
-      end
-
-      @source = Radio.new(query_scope, selector)
-      @frame = @source.parent(tag_name: :form)
-    end
-
-    #
-    # Yields each Radio associated with this set.
-    #
-    # @example
-    #   radio_set = browser.radio_set
-    #   radio_set.each do |radio|
-    #     puts radio.text
-    #   end
-    #
-    # @yieldparam [Watir::RadioSet] element iterate through the radio buttons.
-    #
-
-    def each(&block)
-      radios.each(&block)
-    end
-
-    #
-    # Get the n'th radio button in this set
-    #
-    # @return Watir::Radio
-    #
-
-    def [](idx)
-      radios[idx]
-    end
-
-    #
-    # @return Watir::Radio
-    #
-
-    def radio(opt = {})
-      n = name
-      if !n.empty? && (!opt[:name] || opt[:name] == n)
-        frame.radio(opt.merge name: n)
-      elsif n.empty?
-        return source
-      else
-        raise Watir::Exception::UnknownObjectException, "#{opt[:name]} does not match name of RadioSet: #{n}"
-      end
-
-    end
-
-    #
-    # @return Watir::RadioCollection
-    #
-
-    def radios(opt = {})
-      n = name
-      if !n.empty? && (!opt[:name] || opt[:name] == n)
-        element_call(:wait_for_present) { frame.radios(opt.merge name: n) }
-      elsif n.empty?
-        Watir::RadioCollection.new(frame, element: source.wd)
-      else
-        raise Watir::Exception::UnknownObjectException, "#{opt[:name]} does not match name of RadioSet: #{n}"
-      end
-    end
-
-    #
-    # Returns true if any radio buttons in the set are enabled.
-    #
-    # @return [Boolean]
-    #
-
-    def enabled?
-      any?(&:enabled?)
-    end
-
-    #
-    # Returns true if all radio buttons in the set are disabled.
-    #
-    # @return [Boolean]
-    #
-
-    def disabled?
-      !enabled?
-    end
-
-    #
-    # Returns the name attribute for the set.
-    #
-    # @return [String]
-    #
-
-    def name
-      @name ||= source.name
-    end
-
-    #
-    # If RadioSet exists, this always returns 'radio'.
-    #
-    # @return [String]
-    #
-
-    def type
-      source.send :assert_exists
-      'radio'
-    end
-
-    #
-    # Returns true if the radio set has one or more radio buttons where label matches the given value.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @return [Boolean]
-    #
-
-    def include?(str_or_rx)
-      radio(label: str_or_rx).exist?
-    end
-
-    #
-    # Select the radio button whose value or label matches the given string.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @raise [Watir::Exception::UnknownObjectException] if the Radio does not exist.
-    # @return [String] The value or text of the radio selected.
-    #
-
-    def select(str_or_rx)
-      found_by_value = radio(value: str_or_rx)
-      found_by_text = radio(label: str_or_rx)
-
-      if found_by_value.exist?
-        found_by_value.click unless found_by_value.selected?
-        return found_by_value.value
-      elsif found_by_text.exist?
-        found_by_text.click unless found_by_text.selected?
-        return found_by_text.text
-      else
-        raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
-      end
-    end
-
-    #
-    # Returns true if any of the radio button label matches the given value.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @raise [Watir::Exception::UnknownObjectException] if the options do not exist
-    # @return [Boolean]
-    #
-
-    def selected?(str_or_rx)
-      found = frame.radio(label: str_or_rx)
-
-      return found.selected? if found.exist?
-      raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
-    end
-
-    #
-    # Returns the value of the selected radio button in the set.
-    # Returns nil if no radio is selected.
-    #
-    # @return [String, nil]
-    #
-
-    def value
-      sel = selected
-      sel && sel.value
-    end
-
-    #
-    # Returns the text of the selected radio button in the set.
-    # Returns nil if no option is selected.
-    #
-    # @return [String, nil]
-    #
-
-    def text
-      sel = selected
-      sel && sel.text
-    end
-
-    #
-    # Returns the selected Radio element.
-    # Returns nil if no radio button is selected.
-    #
-    # @return [Watir::Radio, nil]
-    #
-
-    def selected
-      find(&:selected?)
-    end
-
-    #
-    # Returns true if two elements are equal.
-    #
-    # @example
-    #   browser.radio_set(id: 'new_user_newsletter_yes') == browser.radio_set(id: 'new_user_newsletter_no')
-    #   #=> true
-    #
-
-    def ==(other)
-      return false unless other.kind_of?(self.class)
-      radios == other.radios
-    end
-    alias_method :eql?, :==
-
-    private
-
-    def element_call(*args, &blk)
-      source.send :element_call, *args, &blk
-    end
-  end # RadioSet
-
-  module Container
-    def radio_set(*args)
-      RadioSet.new(self, extract_selector(args).merge(tag_name: "input", type: "radio"))
-    end
-
-    Watir.tag_to_class[:radio_set] = RadioSet
-  end # Container
-
-end # Watir
+module Watir
+  class RadioSet
+    extend Forwardable
+    include Watir::Exception
+    include Enumerable
+
+    delegate [:exists?, :present?, :visible?, :browser] => :source
+
+    attr_reader :source, :frame
+
+    def initialize(query_scope, selector)
+      unless selector.kind_of? Hash
+        raise ArgumentError, "invalid argument: #{selector.inspect}"
+      end
+
+      @source = Radio.new(query_scope, selector)
+      @frame = @source.parent(tag_name: :form)
+    end
+
+    #
+    # Yields each Radio associated with this set.
+    #
+    # @example
+    #   radio_set = browser.radio_set
+    #   radio_set.each do |radio|
+    #     puts radio.text
+    #   end
+    #
+    # @yieldparam [Watir::RadioSet] element iterate through the radio buttons.
+    #
+
+    def each(&block)
+      radios.each(&block)
+    end
+
+    #
+    # Get the n'th radio button in this set
+    #
+    # @return Watir::Radio
+    #
+
+    def [](idx)
+      radios[idx]
+    end
+
+    #
+    # @return Watir::Radio
+    #
+
+    def radio(opt = {})
+      n = name
+      if !n.empty? && (!opt[:name] || opt[:name] == n)
+        frame.radio(opt.merge name: n)
+      elsif n.empty?
+        return source
+      else
+        raise Watir::Exception::UnknownObjectException, "#{opt[:name]} does not match name of RadioSet: #{n}"
+      end
+
+    end
+
+    #
+    # @return Watir::RadioCollection
+    #
+
+    def radios(opt = {})
+      n = name
+      if !n.empty? && (!opt[:name] || opt[:name] == n)
+        element_call(:wait_for_present) { frame.radios(opt.merge name: n) }
+      elsif n.empty?
+        Watir::RadioCollection.new(frame, element: source.wd)
+      else
+        raise Watir::Exception::UnknownObjectException, "#{opt[:name]} does not match name of RadioSet: #{n}"
+      end
+    end
+
+    #
+    # Returns true if any radio buttons in the set are enabled.
+    #
+    # @return [Boolean]
+    #
+
+    def enabled?
+      any?(&:enabled?)
+    end
+
+    #
+    # Returns true if all radio buttons in the set are disabled.
+    #
+    # @return [Boolean]
+    #
+
+    def disabled?
+      !enabled?
+    end
+
+    #
+    # Returns the name attribute for the set.
+    #
+    # @return [String]
+    #
+
+    def name
+      @name ||= source.name
+    end
+
+    #
+    # If RadioSet exists, this always returns 'radio'.
+    #
+    # @return [String]
+    #
+
+    def type
+      source.send :assert_exists
+      'radio'
+    end
+
+    #
+    # Returns true if the radio set has one or more radio buttons where label matches the given value.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @return [Boolean]
+    #
+
+    def include?(str_or_rx)
+      radio(label: str_or_rx).exist?
+    end
+
+    #
+    # Select the radio button whose value or label matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::UnknownObjectException] if the Radio does not exist.
+    # @return [String] The value or text of the radio selected.
+    #
+
+    def select(str_or_rx)
+      found_by_value = radio(value: str_or_rx)
+      found_by_text = radio(label: str_or_rx)
+
+      if found_by_value.exist?
+        found_by_value.click unless found_by_value.selected?
+        return found_by_value.value
+      elsif found_by_text.exist?
+        found_by_text.click unless found_by_text.selected?
+        return found_by_text.text
+      else
+        raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
+      end
+    end
+
+    #
+    # Returns true if any of the radio button label matches the given value.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::UnknownObjectException] if the options do not exist
+    # @return [Boolean]
+    #
+
+    def selected?(str_or_rx)
+      found = frame.radio(label: str_or_rx)
+
+      return found.selected? if found.exist?
+      raise UnknownObjectException, "Unable to locate radio matching #{str_or_rx.inspect}"
+    end
+
+    #
+    # Returns the value of the selected radio button in the set.
+    # Returns nil if no radio is selected.
+    #
+    # @return [String, nil]
+    #
+
+    def value
+      sel = selected
+      sel && sel.value
+    end
+
+    #
+    # Returns the text of the selected radio button in the set.
+    # Returns nil if no option is selected.
+    #
+    # @return [String, nil]
+    #
+
+    def text
+      sel = selected
+      sel && sel.text
+    end
+
+    #
+    # Returns the selected Radio element.
+    # Returns nil if no radio button is selected.
+    #
+    # @return [Watir::Radio, nil]
+    #
+
+    def selected
+      find(&:selected?)
+    end
+
+    #
+    # Returns true if two elements are equal.
+    #
+    # @example
+    #   browser.radio_set(id: 'new_user_newsletter_yes') == browser.radio_set(id: 'new_user_newsletter_no')
+    #   #=> true
+    #
+
+    def ==(other)
+      return false unless other.kind_of?(self.class)
+      radios == other.radios
+    end
+    alias_method :eql?, :==
+
+    private
+
+    def element_call(*args, &blk)
+      source.send :element_call, *args, &blk
+    end
+  end # RadioSet
+
+  module Container
+    def radio_set(*args)
+      RadioSet.new(self, extract_selector(args).merge(tag_name: "input", type: "radio"))
+    end
+
+    Watir.tag_to_class[:radio_set] = RadioSet
+  end # Container
+
+end # Watir