watir 6.10.0 → 6.10.1

data/lib/watir/row_container.rb

@@ -1,36 +1,36 @@
-module Watir
-  module RowContainer
-
-    #
-    # Returns table row.
-    #
-
-    def row(*args)
-      Row.new(self, extract_selector(args).merge(tag_name: "tr"))
-    end
-
-    #
-    # Returns table rows collection.
-    #
-
-    def rows(*args)
-      RowCollection.new(self, extract_selector(args).merge(tag_name: "tr"))
-    end
-
-    #
-    # The table as a 2D Array of strings with the text of each cell.
-    #
-    # @return [Array<Array<String>>]
-    #
-
-    def strings
-      wait_for_exists
-
-      rows.inject [] do |res, row|
-        res << row.cells.map(&:text)
-      end
-    end
-    alias_method :to_a, :strings
-
-  end # RowContainer
-end # Watir
+module Watir
+  module RowContainer
+
+    #
+    # Returns table row.
+    #
+
+    def row(*args)
+      Row.new(self, extract_selector(args).merge(tag_name: "tr"))
+    end
+
+    #
+    # Returns table rows collection.
+    #
+
+    def rows(*args)
+      RowCollection.new(self, extract_selector(args).merge(tag_name: "tr"))
+    end
+
+    #
+    # The table as a 2D Array of strings with the text of each cell.
+    #
+    # @return [Array<Array<String>>]
+    #
+
+    def strings
+      wait_for_exists
+
+      rows.inject [] do |res, row|
+        res << row.cells.map(&:text)
+      end
+    end
+    alias_method :to_a, :strings
+
+  end # RowContainer
+end # Watir

data/lib/watir/screenshot.rb

@@ -1,50 +1,50 @@
-module Watir
-  class Screenshot
-
-    def initialize(driver)
-      @driver = driver
-    end
-
-    #
-    # Saves screenshot to given path.
-    #
-    # @example
-    #   browser.screenshot.save "screenshot.png"
-    #
-    # @param [String] path
-    #
-
-    def save(path)
-      @driver.save_screenshot(path)
-    end
-
-    #
-    # Represents screenshot as PNG image string.
-    #
-    # @example
-    #   browser.screenshot.png
-    #   #=> '\x95\xC7\x8C@1\xC07\x1C(Edb\x15\xB2\vL'
-    #
-    # @return [String]
-    #
-
-    def png
-      @driver.screenshot_as(:png)
-    end
-
-    #
-    # Represents screenshot as Base64 encoded string.
-    #
-    # @example
-    #   browser.screenshot.base64
-    #   #=> '7HWJ43tZDscPleeUuPW6HhN3x+z7vU/lufmH0qNTtTum94IBWMT46evImci1vnFGT'
-    #
-    # @return [String]
-    #
-
-    def base64
-      @driver.screenshot_as(:base64)
-    end
-
-  end # Screenshot
-end # Watir
+module Watir
+  class Screenshot
+
+    def initialize(driver)
+      @driver = driver
+    end
+
+    #
+    # Saves screenshot to given path.
+    #
+    # @example
+    #   browser.screenshot.save "screenshot.png"
+    #
+    # @param [String] path
+    #
+
+    def save(path)
+      @driver.save_screenshot(path)
+    end
+
+    #
+    # Represents screenshot as PNG image string.
+    #
+    # @example
+    #   browser.screenshot.png
+    #   #=> '\x95\xC7\x8C@1\xC07\x1C(Edb\x15\xB2\vL'
+    #
+    # @return [String]
+    #
+
+    def png
+      @driver.screenshot_as(:png)
+    end
+
+    #
+    # Represents screenshot as Base64 encoded string.
+    #
+    # @example
+    #   browser.screenshot.base64
+    #   #=> '7HWJ43tZDscPleeUuPW6HhN3x+z7vU/lufmH0qNTtTum94IBWMT46evImci1vnFGT'
+    #
+    # @return [String]
+    #
+
+    def base64
+      @driver.screenshot_as(:base64)
+    end
+
+  end # Screenshot
+end # Watir

data/lib/watir/user_editable.rb

@@ -1,56 +1,56 @@
-module Watir
-  module UserEditable
-
-    #
-    # Clear the element, the type in the given value.
-    #
-    # @param [String, Symbol] args
-    #
-
-    def set(*args)
-      element_call(:wait_for_writable) do
-        @element.clear
-        @element.send_keys(*args)
-      end
-    end
-    alias_method :value=, :set
-
-    #
-    # Uses JavaScript to enter most of the given value.
-    # Selenium is used to enter the first and last characters
-    #
-    # @param [String] input_value
-    #
-
-    def set!(*args)
-      raise ArgumentError, "#set! does not support special keys, use #set instead" if args.any? { |v| v.kind_of?(::Symbol) }
-      input_value = args.join
-      set input_value[0]
-      element_call { execute_js(:setValue, @element, input_value[0..-2]) }
-      append(input_value[-1])
-      raise Watir::Exception::Error, "#set! value does not match expected input" unless value == input_value
-    end
-
-    #
-    # Appends the given value to the text in the text field.
-    #
-    # @param [String, Symbol] args
-    #
-
-    def append(*args)
-      send_keys(*args)
-    end
-    alias_method :<<, :append
-
-    #
-    # Clears the text field.
-    #
-
-    def clear
-      element_call(:wait_for_writable) do
-        @element.clear
-      end
-    end
-
-  end # UserEditable
-end # Watir
+module Watir
+  module UserEditable
+
+    #
+    # Clear the element, the type in the given value.
+    #
+    # @param [String, Symbol] args
+    #
+
+    def set(*args)
+      element_call(:wait_for_writable) do
+        @element.clear
+        @element.send_keys(*args)
+      end
+    end
+    alias_method :value=, :set
+
+    #
+    # Uses JavaScript to enter most of the given value.
+    # Selenium is used to enter the first and last characters
+    #
+    # @param [String] input_value
+    #
+
+    def set!(*args)
+      raise ArgumentError, "#set! does not support special keys, use #set instead" if args.any? { |v| v.kind_of?(::Symbol) }
+      input_value = args.join
+      set input_value[0]
+      element_call { execute_js(:setValue, @element, input_value[0..-2]) }
+      append(input_value[-1])
+      raise Watir::Exception::Error, "#set! value does not match expected input" unless value == input_value
+    end
+
+    #
+    # Appends the given value to the text in the text field.
+    #
+    # @param [String, Symbol] args
+    #
+
+    def append(*args)
+      send_keys(*args)
+    end
+    alias_method :<<, :append
+
+    #
+    # Clears the text field.
+    #
+
+    def clear
+      element_call(:wait_for_writable) do
+        @element.clear
+      end
+    end
+
+  end # UserEditable
+end # Watir

data/lib/watir/wait.rb

@@ -1,200 +1,200 @@
-require 'watir/wait/timer'
-
-module Watir
-  module Wait
-
-    class TimeoutError < StandardError ; end
-
-    INTERVAL = 0.1
-
-
-    class << self
-
-      #
-      # @!attribute timer
-      #   Access Watir timer implementation in use.
-      #   @see Timer
-      #   @return [#wait]
-      #
-
-      attr_writer :timer
-
-      def timer
-        @timer ||= Timer.new
-      end
-
-      #
-      # Waits until the block evaluates to true or times out.
-      #
-      # @example
-      #   Watir::Wait.until { browser.text_field(name: "new_user_first_name").visible? }
-      #
-      # @param [Integer] timeout How long to wait in seconds
-      # @param [String] message Message to raise if timeout is exceeded
-      # @param [Object, NilClass] object Object to evaluate block against
-      # @raise [TimeoutError] if timeout is exceeded
-      #
-
-      def until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
-        if deprecated_message || deprecated_timeout
-          Watir.logger.deprecate "Using arguments for Wait#until", "keywords"
-          timeout = deprecated_timeout
-          message = deprecated_message
-        end
-        timeout ||= Watir.default_timeout
-        run_with_timer(timeout, interval) do
-          result = yield(object)
-          return result if result
-        end
-        raise TimeoutError, message_for(timeout, message)
-      end
-
-      #
-      # Wait while the block evaluates to true or times out.
-      #
-      # @example
-      #   Watir::Wait.while { browser.text_field(name: "abrakadbra").present? }
-      #
-      # @param [Integer] timeout How long to wait in seconds
-      # @param [String] message Message to raise if timeout is exceeded
-      # @param [Object, NilClass] object Object to evaluate block against
-      # @raise [TimeoutError] if timeout is exceeded
-      #
-
-      def while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
-        if deprecated_message || deprecated_timeout
-          Watir.logger.deprecate "Using arguments for Wait#while", "keywords"
-          timeout = deprecated_timeout
-          message = deprecated_message
-        end
-        timeout ||= Watir.default_timeout
-        run_with_timer(timeout, interval) { return unless yield(object) }
-        raise TimeoutError, message_for(timeout, message)
-      end
-
-      private
-
-      def message_for(timeout, message)
-        err = "timed out after #{timeout} seconds"
-        err << ", #{message}" if message
-
-        err
-      end
-
-      def run_with_timer(timeout, interval, &block)
-        if timeout.zero?
-          block.call
-        else
-          timer.wait(timeout) do
-            block.call
-            sleep interval || INTERVAL
-          end
-        end
-      end
-
-    end # self
-  end # Wait
-
-
-  module Waitable
-
-    #
-    # Waits until the condition is true.
-    #
-    # @example
-    #   browser.wait_until(timeout: 2) do |browser|
-    #     browser.windows.size == 1
-    #   end
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").wait_until(&:present?).click
-    #   browser.text_field(name: "new_user_first_name").wait_until(message: 'foo') { |field| field.present? }
-    #   browser.text_field(name: "new_user_first_name").wait_until(timeout: 60, &:present?)
-    #
-    # @param [Integer] timeout seconds to wait before timing out
-    # @param [String] message error message for when times out
-    #
-
-    def wait_until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
-      if deprecated_message || deprecated_timeout
-        Watir.logger.deprecate "Using arguments for #wait_until", "keywords"
-        timeout = deprecated_timeout
-        message = deprecated_message
-      end
-      message ||= "waiting for true condition on #{inspect}"
-      Wait.until(timeout: timeout, message: message, interval: interval, object: self, &blk)
-
-      self
-    end
-
-    #
-    # Waits while the condition is true.
-    #
-    # @example
-    #   browser.wait_while(timeout: 2) do |browser|
-    #     !browser.exists?
-    #   end
-    #
-    # @todo add element example
-    #
-    # @param [Integer] timeout seconds to wait before timing out
-    # @param [String] message error message for when times out
-    #
-
-    def wait_while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
-      if deprecated_message || deprecated_timeout
-        Watir.logger.deprecate "Using arguments for #wait_while", "keywords"
-        timeout = deprecated_timeout
-        message = deprecated_message
-      end
-      message ||= "waiting for false condition on #{inspect}"
-      Wait.while(timeout: timeout, message: message, interval: interval, object: self, &blk)
-
-      self
-    end
-
-    #
-    # Waits until the element is present.
-    #
-    # @example
-    #   browser.text_field(name: "new_user_first_name").wait_until_present
-    #
-    # @param [Integer] timeout seconds to wait before timing out
-    #
-    # @see Watir::Wait
-    # @see Watir::Element#present?
-    #
-
-    def wait_until_present(deprecated_timeout = nil, timeout: nil, interval: nil)
-      if deprecated_timeout
-        Watir.logger.deprecate "Using arguments for #wait_until_present", "keywords"
-        timeout = deprecated_timeout
-      end
-      wait_until(timeout: timeout, interval: interval, &:present?)
-    end
-
-    #
-    # Waits while the element is present.
-    #
-    # @example
-    #   browser.text_field(name: "abrakadbra").wait_while_present
-    #
-    # @param [Integer] timeout seconds to wait before timing out
-    #
-    # @see Watir::Wait
-    # @see Watir::Element#present?
-    #
-
-    def wait_while_present(deprecated_timeout = nil, timeout: nil)
-      if deprecated_timeout
-        Watir.logger.deprecate "Using arguments for #wait_while_present", "keywords"
-        timeout = deprecated_timeout
-      end
-      wait_while(timeout: timeout) do
-        self.reset! if self.is_a? Watir::Element
-        self.present?
-      end
-    end
-
-  end # Waitable
-end # Watir
+require 'watir/wait/timer'
+
+module Watir
+  module Wait
+
+    class TimeoutError < StandardError ; end
+
+    INTERVAL = 0.1
+
+
+    class << self
+
+      #
+      # @!attribute timer
+      #   Access Watir timer implementation in use.
+      #   @see Timer
+      #   @return [#wait]
+      #
+
+      attr_writer :timer
+
+      def timer
+        @timer ||= Timer.new
+      end
+
+      #
+      # Waits until the block evaluates to true or times out.
+      #
+      # @example
+      #   Watir::Wait.until { browser.text_field(name: "new_user_first_name").visible? }
+      #
+      # @param [Integer] timeout How long to wait in seconds
+      # @param [String] message Message to raise if timeout is exceeded
+      # @param [Object, NilClass] object Object to evaluate block against
+      # @raise [TimeoutError] if timeout is exceeded
+      #
+
+      def until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
+        if deprecated_message || deprecated_timeout
+          Watir.logger.deprecate "Using arguments for Wait#until", "keywords"
+          timeout = deprecated_timeout
+          message = deprecated_message
+        end
+        timeout ||= Watir.default_timeout
+        run_with_timer(timeout, interval) do
+          result = yield(object)
+          return result if result
+        end
+        raise TimeoutError, message_for(timeout, message)
+      end
+
+      #
+      # Wait while the block evaluates to true or times out.
+      #
+      # @example
+      #   Watir::Wait.while { browser.text_field(name: "abrakadbra").present? }
+      #
+      # @param [Integer] timeout How long to wait in seconds
+      # @param [String] message Message to raise if timeout is exceeded
+      # @param [Object, NilClass] object Object to evaluate block against
+      # @raise [TimeoutError] if timeout is exceeded
+      #
+
+      def while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
+        if deprecated_message || deprecated_timeout
+          Watir.logger.deprecate "Using arguments for Wait#while", "keywords"
+          timeout = deprecated_timeout
+          message = deprecated_message
+        end
+        timeout ||= Watir.default_timeout
+        run_with_timer(timeout, interval) { return unless yield(object) }
+        raise TimeoutError, message_for(timeout, message)
+      end
+
+      private
+
+      def message_for(timeout, message)
+        err = "timed out after #{timeout} seconds"
+        err << ", #{message}" if message
+
+        err
+      end
+
+      def run_with_timer(timeout, interval, &block)
+        if timeout.zero?
+          block.call
+        else
+          timer.wait(timeout) do
+            block.call
+            sleep interval || INTERVAL
+          end
+        end
+      end
+
+    end # self
+  end # Wait
+
+
+  module Waitable
+
+    #
+    # Waits until the condition is true.
+    #
+    # @example
+    #   browser.wait_until(timeout: 2) do |browser|
+    #     browser.windows.size == 1
+    #   end
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").wait_until(&:present?).click
+    #   browser.text_field(name: "new_user_first_name").wait_until(message: 'foo') { |field| field.present? }
+    #   browser.text_field(name: "new_user_first_name").wait_until(timeout: 60, &:present?)
+    #
+    # @param [Integer] timeout seconds to wait before timing out
+    # @param [String] message error message for when times out
+    #
+
+    def wait_until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
+      if deprecated_message || deprecated_timeout
+        Watir.logger.deprecate "Using arguments for #wait_until", "keywords"
+        timeout = deprecated_timeout
+        message = deprecated_message
+      end
+      message ||= "waiting for true condition on #{inspect}"
+      Wait.until(timeout: timeout, message: message, interval: interval, object: self, &blk)
+
+      self
+    end
+
+    #
+    # Waits while the condition is true.
+    #
+    # @example
+    #   browser.wait_while(timeout: 2) do |browser|
+    #     !browser.exists?
+    #   end
+    #
+    # @todo add element example
+    #
+    # @param [Integer] timeout seconds to wait before timing out
+    # @param [String] message error message for when times out
+    #
+
+    def wait_while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
+      if deprecated_message || deprecated_timeout
+        Watir.logger.deprecate "Using arguments for #wait_while", "keywords"
+        timeout = deprecated_timeout
+        message = deprecated_message
+      end
+      message ||= "waiting for false condition on #{inspect}"
+      Wait.while(timeout: timeout, message: message, interval: interval, object: self, &blk)
+
+      self
+    end
+
+    #
+    # Waits until the element is present.
+    #
+    # @example
+    #   browser.text_field(name: "new_user_first_name").wait_until_present
+    #
+    # @param [Integer] timeout seconds to wait before timing out
+    #
+    # @see Watir::Wait
+    # @see Watir::Element#present?
+    #
+
+    def wait_until_present(deprecated_timeout = nil, timeout: nil, interval: nil)
+      if deprecated_timeout
+        Watir.logger.deprecate "Using arguments for #wait_until_present", "keywords"
+        timeout = deprecated_timeout
+      end
+      wait_until(timeout: timeout, interval: interval, &:present?)
+    end
+
+    #
+    # Waits while the element is present.
+    #
+    # @example
+    #   browser.text_field(name: "abrakadbra").wait_while_present
+    #
+    # @param [Integer] timeout seconds to wait before timing out
+    #
+    # @see Watir::Wait
+    # @see Watir::Element#present?
+    #
+
+    def wait_while_present(deprecated_timeout = nil, timeout: nil)
+      if deprecated_timeout
+        Watir.logger.deprecate "Using arguments for #wait_while_present", "keywords"
+        timeout = deprecated_timeout
+      end
+      wait_while(timeout: timeout) do
+        self.reset! if self.is_a? Watir::Element
+        self.present?
+      end
+    end
+
+  end # Waitable
+end # Watir