watir 6.10.1 → 6.10.2

data/lib/watir/elements/option.rb

@@ -1,72 +1,72 @@
-module Watir
-
-  #
-  # Represents an option in a select list.
-  #
-
-  class Option < HTMLElement
-
-    #
-    # Selects this option.
-    #
-    # @example
-    #   browser.select(id: "foo").options.first.select
-    #
-
-    alias_method :select, :click
-
-    #
-    # Toggles the selected state of this option.
-    #
-    # @example
-    #   browser.select(id: "foo").options.first.toggle
-    #
-
-    alias_method :toggle, :click
-
-    #
-    # Clears (i.e. toggles selected state) option.
-    #
-    # @example
-    #   browser.select(id: "foo").options.first.clear
-    #
-
-    def clear
-      click if selected?
-    end
-
-    #
-    # Is this option selected?
-    #
-    # @return [Boolean]
-    #
-
-    def selected?
-      element_call { @element.selected? }
-    end
-
-    #
-    # Returns the text of option.
-    #
-    # Note that the text is either one of the following respectively:
-    #   * label attribute
-    #   * text attribute
-    #   * inner element text
-    #
-    # @return [String]
-    #
-
-    def text
-      # A little unintuitive - we'll return the 'label' or 'text' attribute if
-      # they exist, otherwise the inner text of the element
-
-      [:label, :text].each do |a|
-        val = attribute_value(a)
-        return val unless val.nil?
-      end
-
-      super
-    end
-
-  end # Option
-end # Watir
+module Watir
+
+  #
+  # Represents an option in a select list.
+  #
+
+  class Option < HTMLElement
+
+    #
+    # Selects this option.
+    #
+    # @example
+    #   browser.select(id: "foo").options.first.select
+    #
+
+    alias_method :select, :click
+
+    #
+    # Toggles the selected state of this option.
+    #
+    # @example
+    #   browser.select(id: "foo").options.first.toggle
+    #
+
+    alias_method :toggle, :click
+
+    #
+    # Clears (i.e. toggles selected state) option.
+    #
+    # @example
+    #   browser.select(id: "foo").options.first.clear
+    #
+
+    def clear
+      click if selected?
+    end
+
+    #
+    # Is this option selected?
+    #
+    # @return [Boolean]
+    #
+
+    def selected?
+      element_call { @element.selected? }
+    end
+
+    #
+    # Returns the text of option.
+    #
+    # Note that the text is either one of the following respectively:
+    #   * label attribute
+    #   * text attribute
+    #   * inner element text
+    #
+    # @return [String]
+    #
+
+    def text
+      # A little unintuitive - we'll return the 'label' or 'text' attribute if
+      # they exist, otherwise the inner text of the element
+
+      [:label, :text].each do |a|
+        val = attribute_value(a)
+        return val unless val.nil?
+      end
+
+      super
+    end
+
+  end # Option
+end # Watir

data/lib/watir/elements/radio.rb

@@ -1,60 +1,60 @@
-module Watir
-  class Radio < Input
-
-    def initialize(query_scope, selector)
-      super
-      @selector[:label] = @selector.delete(:text) if @selector.key?(:text)
-    end
-
-    #
-    # Selects this radio button.
-    #
-
-    def set
-      click unless set?
-    end
-    alias_method :select, :set
-
-    #
-    # Is this radio set?
-    #
-    # @return [Boolean]
-    #
-
-    def set?
-      element_call { @element.selected? }
-    end
-    alias_method :selected?, :set?
-
-    #
-    # Returns the text of the associated label.
-    # Returns empty string if no label is found.
-    #
-    # @return [String]
-    #
-
-    def text
-      l = label()
-      l.exist? ? l.text : ''
-    end
-
-  end # Radio
-
-  module Container
-    def radio(*args)
-      Radio.new(self, extract_selector(args).merge(tag_name: "input", type: "radio"))
-    end
-
-    def radios(*args)
-      RadioCollection.new(self, extract_selector(args).merge(tag_name: "input", type: "radio" ))
-    end
-  end # Container
-
-  class RadioCollection < InputCollection
-    private
-
-    def element_class
-      Radio
-    end
-  end # RadioCollection
-end # Watir
+module Watir
+  class Radio < Input
+
+    def initialize(query_scope, selector)
+      super
+      @selector[:label] = @selector.delete(:text) if @selector.key?(:text)
+    end
+
+    #
+    # Selects this radio button.
+    #
+
+    def set
+      click unless set?
+    end
+    alias_method :select, :set
+
+    #
+    # Is this radio set?
+    #
+    # @return [Boolean]
+    #
+
+    def set?
+      element_call { @element.selected? }
+    end
+    alias_method :selected?, :set?
+
+    #
+    # Returns the text of the associated label.
+    # Returns empty string if no label is found.
+    #
+    # @return [String]
+    #
+
+    def text
+      l = label()
+      l.exist? ? l.text : ''
+    end
+
+  end # Radio
+
+  module Container
+    def radio(*args)
+      Radio.new(self, extract_selector(args).merge(tag_name: "input", type: "radio"))
+    end
+
+    def radios(*args)
+      RadioCollection.new(self, extract_selector(args).merge(tag_name: "input", type: "radio" ))
+    end
+  end # Container
+
+  class RadioCollection < InputCollection
+    private
+
+    def element_class
+      Radio
+    end
+  end # RadioCollection
+end # Watir

data/lib/watir/elements/row.rb

@@ -1,17 +1,17 @@
-module Watir
-
-  #
-  # Custom class representing table row (tr).
-  #
-
-  class Row < TableRow
-  end # Row
-
-  class RowCollection < TableRowCollection
-    def to_a
-      # we do this craziness since the xpath used will find direct child rows
-      # before any rows inside thead/tbody/tfoot...
-      @to_a ||= super.sort_by { |e| e.attribute_value(:rowIndex).to_i }
-    end
-  end
-end # Watir
+module Watir
+
+  #
+  # Custom class representing table row (tr).
+  #
+
+  class Row < TableRow
+  end # Row
+
+  class RowCollection < TableRowCollection
+    def to_a
+      # we do this craziness since the xpath used will find direct child rows
+      # before any rows inside thead/tbody/tfoot...
+      @to_a ||= super.sort_by { |e| e.attribute_value(:rowIndex).to_i }
+    end
+  end
+end # Watir

data/lib/watir/elements/select.rb

@@ -1,250 +1,250 @@
-module Watir
-  class Select < HTMLElement
-    include Watir::Exception
-
-    #
-    # Clears all selected options.
-    #
-
-    def clear
-      raise Error, "you can only clear multi-selects" unless multiple?
-
-      selected_options.each(&:click)
-    end
-
-    #
-    # Gets all the options in the select list
-    #
-    # @return [Watir::OptionCollection]
-    #
-
-    def options(*)
-      element_call(:wait_for_present) { super }
-    end
-
-    #
-    # Returns true if the select list has one or more options where text or label matches the given value.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @return [Boolean]
-    #
-
-    def include?(str_or_rx)
-      option(text: str_or_rx).exist? || option(label: str_or_rx).exist?
-    end
-
-    #
-    # Select the option whose text or label matches the given string.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
-    # @return [String] The text of the option selected. If multiple options match, returns the first match.
-    #
-
-    def select(*str_or_rx)
-      results = str_or_rx.flatten.map { |v| select_by v}
-      results.first
-    end
-
-    #
-    # Select all options whose text or label matches the given string.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
-    # @return [String] The text of the first option selected.
-    #
-
-    def select_all(*str_or_rx)
-      results = str_or_rx.flatten.map { |v| select_all_by v }
-      results.first
-    end
-
-    #
-    # Uses JavaScript to select the option whose text matches the given string.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
-    #
-
-    def select!(*str_or_rx)
-      results = str_or_rx.flatten.map { |v| select_by!(v, :single) }
-      results.first
-    end
-
-    #
-    # Uses JavaScript to select all options whose text matches the given string.
-    #
-    # @param [String, Regexp] str_or_rx
-    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
-    #
-
-    def select_all!(*str_or_rx)
-      results = str_or_rx.flatten.map { |v| select_by!(v, :multiple) }
-      results.first
-    end
-
-    #
-    # Selects the option(s) whose value attribute matches the given string.
-    #
-    # @see +select+
-    #
-    # @param [String, Regexp] str_or_rx
-    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
-    # @return [String] The option selected. If multiple options match, returns the first match
-    #
-
-    def select_value(str_or_rx)
-      Watir.logger.deprecate '#select_value', "#select"
-      select_by str_or_rx
-    end
-
-    #
-    # Returns true if any of the selected options' text or 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)
-      by_text = options(text: str_or_rx)
-      return true if by_text.find(&:selected?)
-
-      by_label = options(label: str_or_rx)
-      return true if by_label.find(&:selected?)
-
-      return false unless by_text.size + by_label.size == 0
-
-      raise(UnknownObjectException, "Unable to locate option matching #{str_or_rx.inspect}")
-    end
-
-    #
-    # Returns the value of the first selected option in the select list.
-    # Returns nil if no option is selected.
-    #
-    # @return [String, nil]
-    #
-
-    def value
-      option = selected_options.first
-      option && option.value
-    end
-
-    #
-    # Returns the text of the first selected option in the select list.
-    # Returns nil if no option is selected.
-    #
-    # @return [String, nil]
-    #
-
-    def text
-      option = selected_options.first
-      option && option.text
-    end
-
-    # Returns an array of currently selected options.
-    #
-    # @return [Array<Watir::Option>]
-    #
-
-    def selected_options
-      element_call { execute_js :selectedOptions, self }
-    end
-
-    private
-
-    def select_by(str_or_rx)
-      found = find_options(:value, str_or_rx)
-
-      if found && found.size > 1
-        Watir.logger.deprecate "Selecting Multiple Options with #select", "#select_all"
-      end
-      return select_matching(found) if found && found.any?
-      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
-    end
-
-    def select_by!(str_or_rx, number)
-      js_rx = case str_or_rx
-              when String
-                "^#{str_or_rx}$"
-              when Regexp
-                str_or_rx.inspect.sub('\\A', '^').sub('\\Z', '$').sub('\\z', '$').sub(/^\//, '').sub(/\/[a-z]*$/, '')
-                    .gsub(/\(\?#.+\)/, '').gsub(/\(\?-\w+:/, '(')
-              else
-                raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
-              end
-
-      element_call { execute_js(:selectOptionsText, self, js_rx, number.to_s) }
-      return selected_options.first.text if matching_option?(:text, str_or_rx)
-
-      element_call { execute_js(:selectOptionsLabel, self, js_rx, number.to_s) }
-      return selected_options.first.text if matching_option?(:label, str_or_rx)
-
-      element_call { execute_js(:selectOptionsValue, self, js_rx, number.to_s) }
-      return selected_options.first.text if matching_option?(:value, str_or_rx)
-
-      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
-    end
-
-    def matching_option?(how, what)
-      selected_options.each do |opt|
-        value = opt.send(how)
-        if what.is_a?(String) ? value == what : value =~ what
-          return true if opt.enabled?
-          raise Watir::Exception::ObjectDisabledException, "option matching #{what} by #{how} on #{inspect} is disabled"
-        end
-      end
-      false
-    end
-
-    def select_all_by(str_or_rx)
-      raise Error, "you can only use #select_all on multi-selects" unless multiple?
-      found = find_options :text, str_or_rx
-
-      return select_matching(found) if found
-      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
-    end
-
-    def find_options(how, str_or_rx)
-      browser.wait_while do
-        case str_or_rx
-        when String, Numeric, Regexp
-          @found = how == :value ? options(value: str_or_rx) : []
-          @found = options(text: str_or_rx) if @found.empty?
-          @found = options(label: str_or_rx) if @found.empty?
-          @found.empty? && Watir.relaxed_locate?
-        else
-          raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
-        end
-      end
-      return @found unless @found.empty?
-      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
-    rescue Wait::TimeoutError
-      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
-    end
-
-    def select_matching(elements)
-      elements = [elements.first] unless multiple?
-      elements.each { |e| e.click unless e.selected? }
-      elements.first.exist? ? elements.first.text : ''
-    end
-
-    def matches_regexp?(how, element, exp)
-      case how
-      when :text
-        element.text =~ exp || element.label =~ exp
-      when :value
-        element.value =~ exp
-      else
-        raise Error, "unknown how: #{how.inspect}"
-      end
-    end
-  end # Select
-
-  module Container
-    alias_method :select_list, :select
-    alias_method :select_lists, :selects
-
-    Watir.tag_to_class[:select_list] = Select
-  end # Container
-end # Watir
+module Watir
+  class Select < HTMLElement
+    include Watir::Exception
+
+    #
+    # Clears all selected options.
+    #
+
+    def clear
+      raise Error, "you can only clear multi-selects" unless multiple?
+
+      selected_options.each(&:click)
+    end
+
+    #
+    # Gets all the options in the select list
+    #
+    # @return [Watir::OptionCollection]
+    #
+
+    def options(*)
+      element_call(:wait_for_present) { super }
+    end
+
+    #
+    # Returns true if the select list has one or more options where text or label matches the given value.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @return [Boolean]
+    #
+
+    def include?(str_or_rx)
+      option(text: str_or_rx).exist? || option(label: str_or_rx).exist?
+    end
+
+    #
+    # Select the option whose text or label matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
+    # @return [String] The text of the option selected. If multiple options match, returns the first match.
+    #
+
+    def select(*str_or_rx)
+      results = str_or_rx.flatten.map { |v| select_by v}
+      results.first
+    end
+
+    #
+    # Select all options whose text or label matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
+    # @return [String] The text of the first option selected.
+    #
+
+    def select_all(*str_or_rx)
+      results = str_or_rx.flatten.map { |v| select_all_by v }
+      results.first
+    end
+
+    #
+    # Uses JavaScript to select the option whose text matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
+    #
+
+    def select!(*str_or_rx)
+      results = str_or_rx.flatten.map { |v| select_by!(v, :single) }
+      results.first
+    end
+
+    #
+    # Uses JavaScript to select all options whose text matches the given string.
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
+    #
+
+    def select_all!(*str_or_rx)
+      results = str_or_rx.flatten.map { |v| select_by!(v, :multiple) }
+      results.first
+    end
+
+    #
+    # Selects the option(s) whose value attribute matches the given string.
+    #
+    # @see +select+
+    #
+    # @param [String, Regexp] str_or_rx
+    # @raise [Watir::Exception::NoValueFoundException] if the value does not exist.
+    # @return [String] The option selected. If multiple options match, returns the first match
+    #
+
+    def select_value(str_or_rx)
+      Watir.logger.deprecate '#select_value', "#select"
+      select_by str_or_rx
+    end
+
+    #
+    # Returns true if any of the selected options' text or 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)
+      by_text = options(text: str_or_rx)
+      return true if by_text.find(&:selected?)
+
+      by_label = options(label: str_or_rx)
+      return true if by_label.find(&:selected?)
+
+      return false unless by_text.size + by_label.size == 0
+
+      raise(UnknownObjectException, "Unable to locate option matching #{str_or_rx.inspect}")
+    end
+
+    #
+    # Returns the value of the first selected option in the select list.
+    # Returns nil if no option is selected.
+    #
+    # @return [String, nil]
+    #
+
+    def value
+      option = selected_options.first
+      option && option.value
+    end
+
+    #
+    # Returns the text of the first selected option in the select list.
+    # Returns nil if no option is selected.
+    #
+    # @return [String, nil]
+    #
+
+    def text
+      option = selected_options.first
+      option && option.text
+    end
+
+    # Returns an array of currently selected options.
+    #
+    # @return [Array<Watir::Option>]
+    #
+
+    def selected_options
+      element_call { execute_js :selectedOptions, self }
+    end
+
+    private
+
+    def select_by(str_or_rx)
+      found = find_options(:value, str_or_rx)
+
+      if found && found.size > 1
+        Watir.logger.deprecate "Selecting Multiple Options with #select", "#select_all"
+      end
+      return select_matching(found) if found && found.any?
+      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+    end
+
+    def select_by!(str_or_rx, number)
+      js_rx = case str_or_rx
+              when String
+                "^#{str_or_rx}$"
+              when Regexp
+                str_or_rx.inspect.sub('\\A', '^').sub('\\Z', '$').sub('\\z', '$').sub(/^\//, '').sub(/\/[a-z]*$/, '')
+                    .gsub(/\(\?#.+\)/, '').gsub(/\(\?-\w+:/, '(')
+              else
+                raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
+              end
+
+      element_call { execute_js(:selectOptionsText, self, js_rx, number.to_s) }
+      return selected_options.first.text if matching_option?(:text, str_or_rx)
+
+      element_call { execute_js(:selectOptionsLabel, self, js_rx, number.to_s) }
+      return selected_options.first.text if matching_option?(:label, str_or_rx)
+
+      element_call { execute_js(:selectOptionsValue, self, js_rx, number.to_s) }
+      return selected_options.first.text if matching_option?(:value, str_or_rx)
+
+      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+    end
+
+    def matching_option?(how, what)
+      selected_options.each do |opt|
+        value = opt.send(how)
+        if what.is_a?(String) ? value == what : value =~ what
+          return true if opt.enabled?
+          raise Watir::Exception::ObjectDisabledException, "option matching #{what} by #{how} on #{inspect} is disabled"
+        end
+      end
+      false
+    end
+
+    def select_all_by(str_or_rx)
+      raise Error, "you can only use #select_all on multi-selects" unless multiple?
+      found = find_options :text, str_or_rx
+
+      return select_matching(found) if found
+      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+    end
+
+    def find_options(how, str_or_rx)
+      browser.wait_while do
+        case str_or_rx
+        when String, Numeric, Regexp
+          @found = how == :value ? options(value: str_or_rx) : []
+          @found = options(text: str_or_rx) if @found.empty?
+          @found = options(label: str_or_rx) if @found.empty?
+          @found.empty? && Watir.relaxed_locate?
+        else
+          raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
+        end
+      end
+      return @found unless @found.empty?
+      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+    rescue Wait::TimeoutError
+      raise NoValueFoundException, "#{str_or_rx.inspect} not found in select list"
+    end
+
+    def select_matching(elements)
+      elements = [elements.first] unless multiple?
+      elements.each { |e| e.click unless e.selected? }
+      elements.first.exist? ? elements.first.text : ''
+    end
+
+    def matches_regexp?(how, element, exp)
+      case how
+      when :text
+        element.text =~ exp || element.label =~ exp
+      when :value
+        element.value =~ exp
+      else
+        raise Error, "unknown how: #{how.inspect}"
+      end
+    end
+  end # Select
+
+  module Container
+    alias_method :select_list, :select
+    alias_method :select_lists, :selects
+
+    Watir.tag_to_class[:select_list] = Select
+  end # Container
+end # Watir