watir 6.10.1 → 6.10.2

data/lib/watir/element_collection.rb

@@ -1,138 +1,138 @@
-module Watir
-
-  #
-  # Base class for element collections.
-  #
-
-  class ElementCollection
-    include Enumerable
-    include Locators::ClassHelpers
-
-    def initialize(query_scope, selector)
-      @query_scope = query_scope
-      @selector = selector
-    end
-
-    #
-    # Yields each element in collection.
-    #
-    # @example
-    #   divs = browser.divs(class: 'kls')
-    #   divs.each do |div|
-    #     puts div.text
-    #   end
-    #
-    # @yieldparam [Watir::Element] element Iterate through the elements in this collection.
-    #
-
-    def each(&blk)
-      to_a.each(&blk)
-    end
-
-    alias_method :length, :count
-    alias_method :size, :count
-
-    alias_method :empty?, :none?
-
-    #
-    # Get the element at the given index.
-    #
-    # Also note that because of Watir's lazy loading, this will return an Element
-    # instance even if the index is out of bounds.
-    #
-    # @param [Integer] idx Index of wanted element, 0-indexed
-    # @return [Watir::Element] Returns an instance of a Watir::Element subclass
-    #
-
-    def [](idx)
-      to_a[idx] || element_class.new(@query_scope, @selector.merge(index: idx))
-    end
-
-    #
-    # Last element of the collection
-    #
-    # @return [Watir::Element] Returns an instance of a Watir::Element subclass
-    #
-
-    def last
-      self[-1]
-    end
-
-    #
-    # This collection as an Array.
-    #
-    # @return [Array<Watir::Element>]
-    #
-
-    def to_a
-      hash = {}
-      @to_a ||=
-          elements.map.with_index do |e, idx|
-            element = element_class.new(@query_scope, @selector.merge(element: e, index: idx))
-            if [Watir::HTMLElement, Watir::Input].include? element.class
-              element = element.to_subtype
-              hash[element.class] ||= []
-              hash[element.class] << element
-              element.class.new(@query_scope, @selector.merge(element: e,
-                                                              tag_name: element.tag_name,
-                                                              index: hash[element.class].size - 1))
-            else
-              element
-            end
-          end
-    end
-
-    #
-    # Locate all elements and return self.
-    #
-    # @return ElementCollection
-    #
-
-    def locate
-      to_a
-      self
-    end
-
-    #
-    # Returns true if two element collections are equal.
-    #
-    # @example
-    #   browser.select_list(name: "new_user_languages").options == browser.select_list(id: "new_user_languages").options
-    #   #=> true
-    #
-    # @example
-    #   browser.select_list(name: "new_user_role").options == browser.select_list(id: "new_user_languages").options
-    #   #=> false
-    #
-
-    def ==(other)
-      to_a == other.to_a
-    end
-    alias_method :eql?, :==
-
-    #
-    # Creates a Collection containing elements of two collections.
-    #
-    # @example
-    #   (browser.select_list(name: "new_user_languages").options + browser.select_list(id: "new_user_role").options).size
-    #   #=> 8
-    #
-
-    private
-
-    def elements
-      @query_scope.send :ensure_context
-
-      element_validator = element_validator_class.new
-      selector_builder = selector_builder_class.new(@query_scope, @selector, element_class.attribute_list)
-      locator = locator_class.new(@query_scope, @selector, selector_builder, element_validator)
-
-      @elements ||= locator.locate_all
-    end
-
-    def element_class
-      Kernel.const_get(self.class.name.sub(/Collection$/, ''))
-    end
-
-  end # ElementCollection
-end # Watir
+module Watir
+
+  #
+  # Base class for element collections.
+  #
+
+  class ElementCollection
+    include Enumerable
+    include Locators::ClassHelpers
+
+    def initialize(query_scope, selector)
+      @query_scope = query_scope
+      @selector = selector
+    end
+
+    #
+    # Yields each element in collection.
+    #
+    # @example
+    #   divs = browser.divs(class: 'kls')
+    #   divs.each do |div|
+    #     puts div.text
+    #   end
+    #
+    # @yieldparam [Watir::Element] element Iterate through the elements in this collection.
+    #
+
+    def each(&blk)
+      to_a.each(&blk)
+    end
+
+    alias_method :length, :count
+    alias_method :size, :count
+
+    alias_method :empty?, :none?
+
+    #
+    # Get the element at the given index.
+    #
+    # Also note that because of Watir's lazy loading, this will return an Element
+    # instance even if the index is out of bounds.
+    #
+    # @param [Integer] idx Index of wanted element, 0-indexed
+    # @return [Watir::Element] Returns an instance of a Watir::Element subclass
+    #
+
+    def [](idx)
+      to_a[idx] || element_class.new(@query_scope, @selector.merge(index: idx))
+    end
+
+    #
+    # Last element of the collection
+    #
+    # @return [Watir::Element] Returns an instance of a Watir::Element subclass
+    #
+
+    def last
+      self[-1]
+    end
+
+    #
+    # This collection as an Array.
+    #
+    # @return [Array<Watir::Element>]
+    #
+
+    def to_a
+      hash = {}
+      @to_a ||=
+          elements.map.with_index do |e, idx|
+            element = element_class.new(@query_scope, @selector.merge(element: e, index: idx))
+            if [Watir::HTMLElement, Watir::Input].include? element.class
+              element = element.to_subtype
+              hash[element.class] ||= []
+              hash[element.class] << element
+              element.class.new(@query_scope, @selector.merge(element: e,
+                                                              tag_name: element.tag_name,
+                                                              index: hash[element.class].size - 1))
+            else
+              element
+            end
+          end
+    end
+
+    #
+    # Locate all elements and return self.
+    #
+    # @return ElementCollection
+    #
+
+    def locate
+      to_a
+      self
+    end
+
+    #
+    # Returns true if two element collections are equal.
+    #
+    # @example
+    #   browser.select_list(name: "new_user_languages").options == browser.select_list(id: "new_user_languages").options
+    #   #=> true
+    #
+    # @example
+    #   browser.select_list(name: "new_user_role").options == browser.select_list(id: "new_user_languages").options
+    #   #=> false
+    #
+
+    def ==(other)
+      to_a == other.to_a
+    end
+    alias_method :eql?, :==
+
+    #
+    # Creates a Collection containing elements of two collections.
+    #
+    # @example
+    #   (browser.select_list(name: "new_user_languages").options + browser.select_list(id: "new_user_role").options).size
+    #   #=> 8
+    #
+
+    private
+
+    def elements
+      @query_scope.send :ensure_context
+
+      element_validator = element_validator_class.new
+      selector_builder = selector_builder_class.new(@query_scope, @selector, element_class.attribute_list)
+      locator = locator_class.new(@query_scope, @selector, selector_builder, element_validator)
+
+      @elements ||= locator.locate_all
+    end
+
+    def element_class
+      Kernel.const_get(self.class.name.sub(/Collection$/, ''))
+    end
+
+  end # ElementCollection
+end # Watir

data/lib/watir/elements/area.rb

@@ -1,12 +1,12 @@
-module Watir
-  class Area < HTMLElement
-
-    #
-    # @todo temporarily add href attribute
-    #
-    # @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=23192
-    #
-    attribute String, :href, :href
-
-  end # Area
-end # Watir
+module Watir
+  class Area < HTMLElement
+
+    #
+    # @todo temporarily add href attribute
+    #
+    # @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=23192
+    #
+    attribute String, :href, :href
+
+  end # Area
+end # Watir

data/lib/watir/elements/button.rb

@@ -1,37 +1,37 @@
-module Watir
-
-  #
-  # Class representing button elements.
-  #
-  # This class covers both <button> and <input type="submit|reset|image|button" /> elements.
-  #
-
-  class Button < HTMLElement
-
-    inherit_attributes_from Watir::Input
-
-    VALID_TYPES = %w[button reset submit image]
-
-    #
-    # Returns the text of the button.
-    #
-    # For input elements, returns the "value" attribute.
-    # For button elements, returns the inner text.
-    #
-    # @return [String]
-    #
-
-    def text
-      tn = tag_name
-
-      case tn
-      when 'input'
-        value
-      when 'button'
-        super
-      else
-        raise Exception::Error, "unknown tag name for button: #{tn}"
-      end
-    end
-  end # Button
-end # Watir
+module Watir
+
+  #
+  # Class representing button elements.
+  #
+  # This class covers both <button> and <input type="submit|reset|image|button" /> elements.
+  #
+
+  class Button < HTMLElement
+
+    inherit_attributes_from Watir::Input
+
+    VALID_TYPES = %w[button reset submit image]
+
+    #
+    # Returns the text of the button.
+    #
+    # For input elements, returns the "value" attribute.
+    # For button elements, returns the inner text.
+    #
+    # @return [String]
+    #
+
+    def text
+      tn = tag_name
+
+      case tn
+      when 'input'
+        value
+      when 'button'
+        super
+      else
+        raise Exception::Error, "unknown tag name for button: #{tn}"
+      end
+    end
+  end # Button
+end # Watir

data/lib/watir/elements/cell.rb

@@ -1,17 +1,17 @@
-module Watir
-
-  #
-  # Custom class representing table cell (th or td).
-  #
-
-  class Cell < TableCell
-  end # Cell
-
-  class CellCollection < TableCellCollection
-    def elements
-      # we do this craziness since the xpath used will find direct child rows
-      # before any rows inside thead/tbody/tfoot...
-      super.sort_by { |e| e.attribute(:cellIndex).to_i }
-    end
-  end
-end # Watir
+module Watir
+
+  #
+  # Custom class representing table cell (th or td).
+  #
+
+  class Cell < TableCell
+  end # Cell
+
+  class CellCollection < TableCellCollection
+    def elements
+      # we do this craziness since the xpath used will find direct child rows
+      # before any rows inside thead/tbody/tfoot...
+      super.sort_by { |e| e.attribute(:cellIndex).to_i }
+    end
+  end
+end # Watir

data/lib/watir/elements/checkbox.rb

@@ -1,56 +1,56 @@
-module Watir
-  class CheckBox < Input
-
-    #
-    # Sets checkbox to the given value.
-    #
-    # @example
-    #   checkbox = browser.checkbox(id: 'new_user_interests_cars')
-    #   checkbox.set?        #=> false
-    #   checkbox.set
-    #   checkbox.set?        #=> true
-    #   checkbox.set(false)
-    #   checkbox.set?        #=> false
-    #
-    # @param [Boolean] bool
-    #
-
-    def set(bool = true)
-      set? == bool ? assert_enabled : click
-    end
-    alias_method :check, :set
-
-    #
-    # Returns true if the element is checked
-    # @return [Boolean]
-    #
-
-    def set?
-      element_call { @element.selected? }
-    end
-    alias_method :checked?, :set?
-
-    #
-    # Unsets checkbox.
-    #
-
-    def clear
-      set false
-    end
-    alias_method :uncheck, :clear
-
-  end # CheckBox
-
-  module Container
-    def checkbox(*args)
-      CheckBox.new(self, extract_selector(args).merge(tag_name: "input", type: "checkbox"))
-    end
-
-    def checkboxes(*args)
-      CheckBoxCollection.new(self, extract_selector(args).merge(tag_name: "input", type: "checkbox"))
-    end
-  end # Container
-
-  class CheckBoxCollection < InputCollection
-  end # CheckBoxCollection
-end # Watir
+module Watir
+  class CheckBox < Input
+
+    #
+    # Sets checkbox to the given value.
+    #
+    # @example
+    #   checkbox = browser.checkbox(id: 'new_user_interests_cars')
+    #   checkbox.set?        #=> false
+    #   checkbox.set
+    #   checkbox.set?        #=> true
+    #   checkbox.set(false)
+    #   checkbox.set?        #=> false
+    #
+    # @param [Boolean] bool
+    #
+
+    def set(bool = true)
+      set? == bool ? assert_enabled : click
+    end
+    alias_method :check, :set
+
+    #
+    # Returns true if the element is checked
+    # @return [Boolean]
+    #
+
+    def set?
+      element_call { @element.selected? }
+    end
+    alias_method :checked?, :set?
+
+    #
+    # Unsets checkbox.
+    #
+
+    def clear
+      set false
+    end
+    alias_method :uncheck, :clear
+
+  end # CheckBox
+
+  module Container
+    def checkbox(*args)
+      CheckBox.new(self, extract_selector(args).merge(tag_name: "input", type: "checkbox"))
+    end
+
+    def checkboxes(*args)
+      CheckBoxCollection.new(self, extract_selector(args).merge(tag_name: "input", type: "checkbox"))
+    end
+  end # Container
+
+  class CheckBoxCollection < InputCollection
+  end # CheckBoxCollection
+end # Watir