watir 6.10.1 → 6.10.2

data/lib/watir/adjacent.rb

@@ -1,126 +1,126 @@
-module Watir
-  module Adjacent
-
-    #
-    # Returns parent element of current element.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").parent == browser.fieldset
-    #   #=> true
-    #
-
-    def parent(opt = {})
-      xpath_adjacent(opt.merge(adjacent: :ancestor, plural: false))
-    end
-
-    #
-    # Returns preceding sibling element of current element.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").preceding_sibling(index: 1) == browser.legend
-    #   #=> true
-    #
-
-    def preceding_sibling(opt = {})
-      xpath_adjacent(opt.merge(adjacent: :preceding, plural: false))
-    end
-    alias_method :previous_sibling, :preceding_sibling
-
-    #
-    # Returns collection of preceding sibling elements of current element.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").preceding_siblings.size
-    #   #=> 3
-    #
-
-    def preceding_siblings(opt = {})
-      raise ArgumentError, "#previous_siblings can not take an index value" if opt[:index]
-      xpath_adjacent(opt.merge(adjacent: :preceding, plural: true))
-    end
-    alias_method :previous_siblings, :preceding_siblings
-
-    #
-    # Returns following sibling element of current element.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").following_sibling(index: 2) == browser.text_field(id: "new_user_last_name")
-    #   #=> true
-    #
-
-    def following_sibling(opt = {})
-      xpath_adjacent(opt.merge(adjacent: :following, plural: false))
-    end
-    alias_method :next_sibling, :following_sibling
-
-    #
-    # Returns collection of following sibling elements of current element.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").following_siblings.size
-    #   #=> 52
-    #
-
-    def following_siblings(opt = {})
-      raise ArgumentError, "#next_siblings can not take an index value" if opt[:index]
-      xpath_adjacent(opt.merge(adjacent: :following, plural: true))
-    end
-    alias_method :next_siblings, :following_siblings
-
-
-    #
-    # Returns collection of siblings of current element, including current element.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").siblings.size
-    #   #=> 56
-    #
-
-    def siblings(opt = {})
-      parent.children(opt)
-    end
-
-    #
-    # Returns element of direct child of current element.
-    #
-    # @example
-    #   browser.form(id: "new_user").child == browser.fieldset
-    #   #=> true
-    #
-
-    def child(opt = {})
-      xpath_adjacent(opt.merge(adjacent: :child, plural: false))
-    end
-
-    #
-    # Returns collection of elements of direct children of current element.
-    #
-    # @example
-    #   browser.select_list(id: "new_user_languages").children == browser.select_list(id: "new_user_languages").options.to_a
-    #   #=> true
-    #
-
-    def children(opt = {})
-      raise ArgumentError, "#children can not take an index value" if opt[:index]
-      xpath_adjacent(opt.merge(adjacent: :child, plural: true))
-    end
-
-    private
-
-    def xpath_adjacent(opt = {})
-      plural = opt.delete(:plural)
-      opt[:index] ||= 0 unless plural || opt.values.any? { |e| e.is_a? Regexp }
-      klass = if !plural && opt[:tag_name]
-                Watir.tag_to_class[opt[:tag_name].to_sym]
-              elsif !plural
-                HTMLElement
-              elsif opt[:tag_name]
-                 Object.const_get("#{self.send(opt[:tag_name]).class}Collection")
-              else
-                HTMLElementCollection
-              end
-      klass.new(self, opt)
-    end
-
-  end # Adjacent
-end # Watir
+module Watir
+  module Adjacent
+
+    #
+    # Returns parent element of current element.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").parent == browser.fieldset
+    #   #=> true
+    #
+
+    def parent(opt = {})
+      xpath_adjacent(opt.merge(adjacent: :ancestor, plural: false))
+    end
+
+    #
+    # Returns preceding sibling element of current element.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").preceding_sibling(index: 1) == browser.legend
+    #   #=> true
+    #
+
+    def preceding_sibling(opt = {})
+      xpath_adjacent(opt.merge(adjacent: :preceding, plural: false))
+    end
+    alias_method :previous_sibling, :preceding_sibling
+
+    #
+    # Returns collection of preceding sibling elements of current element.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").preceding_siblings.size
+    #   #=> 3
+    #
+
+    def preceding_siblings(opt = {})
+      raise ArgumentError, "#previous_siblings can not take an index value" if opt[:index]
+      xpath_adjacent(opt.merge(adjacent: :preceding, plural: true))
+    end
+    alias_method :previous_siblings, :preceding_siblings
+
+    #
+    # Returns following sibling element of current element.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").following_sibling(index: 2) == browser.text_field(id: "new_user_last_name")
+    #   #=> true
+    #
+
+    def following_sibling(opt = {})
+      xpath_adjacent(opt.merge(adjacent: :following, plural: false))
+    end
+    alias_method :next_sibling, :following_sibling
+
+    #
+    # Returns collection of following sibling elements of current element.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").following_siblings.size
+    #   #=> 52
+    #
+
+    def following_siblings(opt = {})
+      raise ArgumentError, "#next_siblings can not take an index value" if opt[:index]
+      xpath_adjacent(opt.merge(adjacent: :following, plural: true))
+    end
+    alias_method :next_siblings, :following_siblings
+
+
+    #
+    # Returns collection of siblings of current element, including current element.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").siblings.size
+    #   #=> 56
+    #
+
+    def siblings(opt = {})
+      parent.children(opt)
+    end
+
+    #
+    # Returns element of direct child of current element.
+    #
+    # @example
+    #   browser.form(id: "new_user").child == browser.fieldset
+    #   #=> true
+    #
+
+    def child(opt = {})
+      xpath_adjacent(opt.merge(adjacent: :child, plural: false))
+    end
+
+    #
+    # Returns collection of elements of direct children of current element.
+    #
+    # @example
+    #   browser.select_list(id: "new_user_languages").children == browser.select_list(id: "new_user_languages").options.to_a
+    #   #=> true
+    #
+
+    def children(opt = {})
+      raise ArgumentError, "#children can not take an index value" if opt[:index]
+      xpath_adjacent(opt.merge(adjacent: :child, plural: true))
+    end
+
+    private
+
+    def xpath_adjacent(opt = {})
+      plural = opt.delete(:plural)
+      opt[:index] ||= 0 unless plural || opt.values.any? { |e| e.is_a? Regexp }
+      klass = if !plural && opt[:tag_name]
+                Watir.tag_to_class[opt[:tag_name].to_sym]
+              elsif !plural
+                HTMLElement
+              elsif opt[:tag_name]
+                 Object.const_get("#{self.send(opt[:tag_name]).class}Collection")
+              else
+                HTMLElementCollection
+              end
+      klass.new(self, opt)
+    end
+
+  end # Adjacent
+end # Watir

data/lib/watir/after_hooks.rb

@@ -1,132 +1,132 @@
-module Watir
-
-  #
-  # After hooks are blocks that run after certain browser events.
-  # They are generally used to ensure application under test does not encounter
-  # any error and are automatically executed after following events:
-  #   1. Open URL.
-  #   2. Refresh page.
-  #   3. Click, double-click or right-click on element.
-  #   4. Alert closing.
-  #
-
-  class AfterHooks
-    include Enumerable
-
-    def initialize(browser)
-      @browser = browser
-      @after_hooks = []
-    end
-
-    #
-    # Adds new after hook.
-    #
-    # @example
-    #   browser.after_hooks.add do |browser|
-    #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
-    #   end
-    #   browser.goto "watir.github.io/404"
-    #   "Application exception or 500 error!"
-    #
-    # @param [#call] after_hook Object responding to call
-    # @yield after_hook block
-    # @yieldparam [Watir::Browser]
-    #
-
-    def add(after_hook = nil, &block)
-      if block_given?
-        @after_hooks << block
-      elsif after_hook.respond_to? :call
-        @after_hooks << after_hook
-      else
-        raise ArgumentError, "expected block or object responding to #call"
-      end
-    end
-    alias_method :<<, :add
-
-    #
-    # Deletes after hook.
-    #
-    # @example
-    #   browser.after_hooks.add do |browser|
-    #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
-    #   end
-    #   browser.goto "watir.github.io/404"
-    #   "Application exception or 500 error!"
-    #   browser.after_hooks.delete browser.after_hooks[0]
-    #   browser.refresh
-    #
-
-    def delete(after_hook)
-      @after_hooks.delete(after_hook)
-    end
-
-    #
-    # Runs after hooks.
-    #
-
-    def run
-      if @after_hooks.any? && @browser.window.present? && !@browser.alert.exists?
-        each { |after_hook| after_hook.call(@browser) }
-      end
-    end
-
-    #
-    # Executes a block without running error after hooks.
-    #
-    # @example
-    #   browser.after_hooks.without do |browser|
-    #     browser.element(name: "new_user_button").click
-    #   end
-    #
-    # @yield Block that is executed without after hooks being run
-    # @yieldparam [Watir::Browser]
-    #
-
-    def without
-      current_after_hooks = @after_hooks
-      @after_hooks = []
-      yield(@browser)
-    ensure
-      @after_hooks = current_after_hooks
-    end
-
-    #
-    # Yields each after hook.
-    #
-    # @yieldparam [#call] after_hook Object responding to call
-    #
-
-    def each
-      @after_hooks.each { |after_hook| yield after_hook }
-    end
-
-    #
-    # Returns number of after hooks.
-    #
-    # @example
-    #   browser.after_hooks.add { puts 'Some after_hook.' }
-    #   browser.after_hooks.length
-    #   #=> 1
-    #
-    # @return [Integer]
-    #
-
-    def length
-      @after_hooks.length
-    end
-    alias_method :size, :length
-
-    #
-    # Gets the after hook at the given index.
-    #
-    # @param [Integer] index
-    # @return [#call]
-    #
-
-    def [](index)
-      @after_hooks[index]
-    end
-
-  end # AfterHooks
-end # Watir
+module Watir
+
+  #
+  # After hooks are blocks that run after certain browser events.
+  # They are generally used to ensure application under test does not encounter
+  # any error and are automatically executed after following events:
+  #   1. Open URL.
+  #   2. Refresh page.
+  #   3. Click, double-click or right-click on element.
+  #   4. Alert closing.
+  #
+
+  class AfterHooks
+    include Enumerable
+
+    def initialize(browser)
+      @browser = browser
+      @after_hooks = []
+    end
+
+    #
+    # Adds new after hook.
+    #
+    # @example
+    #   browser.after_hooks.add do |browser|
+    #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
+    #   end
+    #   browser.goto "watir.github.io/404"
+    #   "Application exception or 500 error!"
+    #
+    # @param [#call] after_hook Object responding to call
+    # @yield after_hook block
+    # @yieldparam [Watir::Browser]
+    #
+
+    def add(after_hook = nil, &block)
+      if block_given?
+        @after_hooks << block
+      elsif after_hook.respond_to? :call
+        @after_hooks << after_hook
+      else
+        raise ArgumentError, "expected block or object responding to #call"
+      end
+    end
+    alias_method :<<, :add
+
+    #
+    # Deletes after hook.
+    #
+    # @example
+    #   browser.after_hooks.add do |browser|
+    #     browser.text.include?("Server Error") and puts "Application exception or 500 error!"
+    #   end
+    #   browser.goto "watir.github.io/404"
+    #   "Application exception or 500 error!"
+    #   browser.after_hooks.delete browser.after_hooks[0]
+    #   browser.refresh
+    #
+
+    def delete(after_hook)
+      @after_hooks.delete(after_hook)
+    end
+
+    #
+    # Runs after hooks.
+    #
+
+    def run
+      if @after_hooks.any? && @browser.window.present? && !@browser.alert.exists?
+        each { |after_hook| after_hook.call(@browser) }
+      end
+    end
+
+    #
+    # Executes a block without running error after hooks.
+    #
+    # @example
+    #   browser.after_hooks.without do |browser|
+    #     browser.element(name: "new_user_button").click
+    #   end
+    #
+    # @yield Block that is executed without after hooks being run
+    # @yieldparam [Watir::Browser]
+    #
+
+    def without
+      current_after_hooks = @after_hooks
+      @after_hooks = []
+      yield(@browser)
+    ensure
+      @after_hooks = current_after_hooks
+    end
+
+    #
+    # Yields each after hook.
+    #
+    # @yieldparam [#call] after_hook Object responding to call
+    #
+
+    def each
+      @after_hooks.each { |after_hook| yield after_hook }
+    end
+
+    #
+    # Returns number of after hooks.
+    #
+    # @example
+    #   browser.after_hooks.add { puts 'Some after_hook.' }
+    #   browser.after_hooks.length
+    #   #=> 1
+    #
+    # @return [Integer]
+    #
+
+    def length
+      @after_hooks.length
+    end
+    alias_method :size, :length
+
+    #
+    # Gets the after hook at the given index.
+    #
+    # @param [Integer] index
+    # @return [#call]
+    #
+
+    def [](index)
+      @after_hooks[index]
+    end
+
+  end # AfterHooks
+end # Watir