watir 6.10.0 → 6.10.1

data/lib/watir/wait/timer.rb

@@ -1,52 +1,52 @@
-module Watir
-  module Wait
-    class Timer
-
-      def initialize(timeout: nil)
-        @end_time = current_time + timeout if timeout
-        @remaining_time = @end_time - current_time if @end_time
-      end
-
-      #
-      # Executes given block until it returns true or exceeds timeout.
-      # @param [Integer] timeout
-      # @yield block
-      # @api private
-      #
-
-      def wait(timeout, &block)
-        end_time = @end_time || current_time + timeout
-        loop do
-          yield(block)
-          @remaining_time = end_time - current_time
-          break if @remaining_time < 0
-        end
-      end
-
-      def remaining_time
-        @end_time - current_time
-      end
-
-      def reset!
-        @end_time = nil
-      end
-
-      def locked?
-        !@end_time.nil?
-      end
-
-      private
-
-      if defined?(Process::CLOCK_MONOTONIC)
-        def current_time
-          Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        end
-      else
-        def current_time
-          ::Time.now.to_f
-        end
-      end
-
-    end # Timer
-  end # Wait
-end # Watir
+module Watir
+  module Wait
+    class Timer
+
+      def initialize(timeout: nil)
+        @end_time = current_time + timeout if timeout
+        @remaining_time = @end_time - current_time if @end_time
+      end
+
+      #
+      # Executes given block until it returns true or exceeds timeout.
+      # @param [Integer] timeout
+      # @yield block
+      # @api private
+      #
+
+      def wait(timeout, &block)
+        end_time = @end_time || current_time + timeout
+        loop do
+          yield(block)
+          @remaining_time = end_time - current_time
+          break if @remaining_time < 0
+        end
+      end
+
+      def remaining_time
+        @end_time - current_time
+      end
+
+      def reset!
+        @end_time = nil
+      end
+
+      def locked?
+        !@end_time.nil?
+      end
+
+      private
+
+      if defined?(Process::CLOCK_MONOTONIC)
+        def current_time
+          Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        end
+      else
+        def current_time
+          ::Time.now.to_f
+        end
+      end
+
+    end # Timer
+  end # Wait
+end # Watir

data/lib/watir/window.rb

@@ -1,257 +1,257 @@
-module Watir
-  class Window
-    include EventuallyPresent
-    include Waitable
-
-    def initialize(browser, selector)
-      @browser = browser
-      @driver = browser.driver
-      @selector = selector
-
-      if selector.empty?
-        @handle = current_window
-      elsif selector.key? :handle
-        @handle = selector.delete :handle
-      else
-        unless selector.keys.all? { |k| [:title, :url, :index].include? k }
-          raise ArgumentError, "invalid window selector: #{selector.inspect}"
-        end
-      end
-    end
-
-    def inspect
-      '#<%s:0x%x located=%s>' % [self.class, hash*2, !!@handle]
-    end
-
-    #
-    # Returns window size.
-    #
-    # @example
-    #   size = browser.window.size
-    #   [size.width, size.height] #=> [1600, 1200]
-    #
-
-    def size
-      size = nil
-      use { size = @driver.manage.window.size }
-
-      size
-    end
-
-    #
-    # Returns window position.
-    #
-    # @example
-    #   position = browser.window.position
-    #   [position.x, position.y] #=> [92, 76]
-    #
-
-    def position
-      pos = nil
-      use { pos = @driver.manage.window.position }
-
-      pos
-    end
-
-    #
-    # Resizes window to given width and height.
-    #
-    # @example
-    #   browser.window.resize_to 1600, 1200
-    #
-    # @param [Integer] width
-    # @param [Integer] height
-    #
-
-    def resize_to(width, height)
-      dimension = Selenium::WebDriver::Dimension.new(Integer(width), Integer(height))
-      use { @driver.manage.window.size = dimension }
-
-      dimension
-    end
-
-    #
-    # Moves window to given x and y coordinates.
-    #
-    # @example
-    #   browser.window.move_to 300, 200
-    #
-    # @param [Integer] x
-    # @param [Integer] y
-    #
-
-    def move_to(x, y)
-      point = Selenium::WebDriver::Point.new(Integer(x), Integer(y))
-      use { @driver.manage.window.position = point }
-
-      point
-    end
-
-    #
-    # Maximizes window.
-    #
-    # @example
-    #   browser.window.maximize
-    #
-
-    def maximize
-      use { @driver.manage.window.maximize }
-    end
-
-    #
-    # Returns true if window exists.
-    #
-    # @return [Boolean]
-    #
-
-    def exists?
-      assert_exists
-      true
-    rescue Exception::NoMatchingWindowFoundException
-      false
-    end
-
-    alias_method :present?, :exists?
-    alias_method :exist?, :exists?
-
-    #
-    # Returns true if two windows are equal.
-    #
-    # @example
-    #   browser.window(index: 0) == browser.window(index: 1)
-    #   #=> false
-    #
-    # @param [Window] other
-    #
-
-    def ==(other)
-      return false unless other.kind_of?(self.class)
-
-      handle == other.handle
-    end
-    alias_method :eql?, :==
-
-    def hash
-      handle.hash ^ self.class.hash
-    end
-
-    #
-    # Returns true if window is current.
-    #
-    # @example
-    #   browser.window.current?
-    #   #=> true
-    #
-
-    def current?
-      current_window == handle
-    end
-
-    #
-    # Closes window.
-    #
-
-    def close
-      @browser.original_window = nil if self == @browser.original_window
-      use { @driver.close }
-    end
-
-    #
-    # Returns window title.
-    #
-    # @return [String]
-    #
-
-    def title
-      title = nil
-      use { title = @driver.title }
-
-      title
-    end
-
-    #
-    # Returns window URL.
-    #
-    # @return [String]
-    #
-
-    def url
-      url = nil
-      use { url = @driver.current_url }
-
-      url
-    end
-
-    #
-    # Switches to given window and executes block, then switches back.
-    #
-    # @example
-    #   browser.window(title: "closeable window").use do
-    #     browser.a(id: "close").click
-    #   end
-    #
-
-    def use(&blk)
-      @browser.original_window ||= current_window
-      wait_for_exists
-      @driver.switch_to.window(handle, &blk)
-      self
-    end
-
-    protected
-
-    def handle
-      @handle ||= locate
-    end
-
-    # Referenced in EventuallyPresent
-    def selector_string
-      @selector.inspect
-    end
-
-    private
-
-    def locate
-      if @selector.empty?
-        nil
-      elsif @selector.key?(:index)
-        @driver.window_handles[Integer(@selector[:index])]
-      else
-        @driver.window_handles.find { |wh| matches?(wh) }
-      end
-    end
-
-    def assert_exists
-      raise(Exception::NoMatchingWindowFoundException, @selector.inspect) unless @driver.window_handles.include?(handle)
-    end
-
-    # return a handle to the currently active window if it is still open; otherwise nil
-    def current_window
-      @driver.window_handle
-    rescue Selenium::WebDriver::Error::NoSuchWindowError
-      nil
-    end
-
-    def matches?(handle)
-      @driver.switch_to.window(handle) {
-        matches_title = @selector[:title].nil? || @selector[:title] === @driver.title
-        matches_url   = @selector[:url].nil? || @selector[:url] === @driver.current_url
-
-        matches_title && matches_url
-      }
-    rescue Selenium::WebDriver::Error::NoSuchWindowError, Selenium::WebDriver::Error::NoSuchDriverError
-      # the window may disappear while we're iterating.
-      false
-    end
-
-    def wait_for_exists
-      return assert_exists unless Watir.relaxed_locate?
-      begin
-        wait_until(&:exists?)
-      rescue Wait::TimeoutError
-        raise Exception::NoMatchingWindowFoundException, @selector.inspect
-      end
-    end
-
-  end # Window
-end # Watir
+module Watir
+  class Window
+    include EventuallyPresent
+    include Waitable
+
+    def initialize(browser, selector)
+      @browser = browser
+      @driver = browser.driver
+      @selector = selector
+
+      if selector.empty?
+        @handle = current_window
+      elsif selector.key? :handle
+        @handle = selector.delete :handle
+      else
+        unless selector.keys.all? { |k| [:title, :url, :index].include? k }
+          raise ArgumentError, "invalid window selector: #{selector.inspect}"
+        end
+      end
+    end
+
+    def inspect
+      '#<%s:0x%x located=%s>' % [self.class, hash*2, !!@handle]
+    end
+
+    #
+    # Returns window size.
+    #
+    # @example
+    #   size = browser.window.size
+    #   [size.width, size.height] #=> [1600, 1200]
+    #
+
+    def size
+      size = nil
+      use { size = @driver.manage.window.size }
+
+      size
+    end
+
+    #
+    # Returns window position.
+    #
+    # @example
+    #   position = browser.window.position
+    #   [position.x, position.y] #=> [92, 76]
+    #
+
+    def position
+      pos = nil
+      use { pos = @driver.manage.window.position }
+
+      pos
+    end
+
+    #
+    # Resizes window to given width and height.
+    #
+    # @example
+    #   browser.window.resize_to 1600, 1200
+    #
+    # @param [Integer] width
+    # @param [Integer] height
+    #
+
+    def resize_to(width, height)
+      dimension = Selenium::WebDriver::Dimension.new(Integer(width), Integer(height))
+      use { @driver.manage.window.size = dimension }
+
+      dimension
+    end
+
+    #
+    # Moves window to given x and y coordinates.
+    #
+    # @example
+    #   browser.window.move_to 300, 200
+    #
+    # @param [Integer] x
+    # @param [Integer] y
+    #
+
+    def move_to(x, y)
+      point = Selenium::WebDriver::Point.new(Integer(x), Integer(y))
+      use { @driver.manage.window.position = point }
+
+      point
+    end
+
+    #
+    # Maximizes window.
+    #
+    # @example
+    #   browser.window.maximize
+    #
+
+    def maximize
+      use { @driver.manage.window.maximize }
+    end
+
+    #
+    # Returns true if window exists.
+    #
+    # @return [Boolean]
+    #
+
+    def exists?
+      assert_exists
+      true
+    rescue Exception::NoMatchingWindowFoundException
+      false
+    end
+
+    alias_method :present?, :exists?
+    alias_method :exist?, :exists?
+
+    #
+    # Returns true if two windows are equal.
+    #
+    # @example
+    #   browser.window(index: 0) == browser.window(index: 1)
+    #   #=> false
+    #
+    # @param [Window] other
+    #
+
+    def ==(other)
+      return false unless other.kind_of?(self.class)
+
+      handle == other.handle
+    end
+    alias_method :eql?, :==
+
+    def hash
+      handle.hash ^ self.class.hash
+    end
+
+    #
+    # Returns true if window is current.
+    #
+    # @example
+    #   browser.window.current?
+    #   #=> true
+    #
+
+    def current?
+      current_window == handle
+    end
+
+    #
+    # Closes window.
+    #
+
+    def close
+      @browser.original_window = nil if self == @browser.original_window
+      use { @driver.close }
+    end
+
+    #
+    # Returns window title.
+    #
+    # @return [String]
+    #
+
+    def title
+      title = nil
+      use { title = @driver.title }
+
+      title
+    end
+
+    #
+    # Returns window URL.
+    #
+    # @return [String]
+    #
+
+    def url
+      url = nil
+      use { url = @driver.current_url }
+
+      url
+    end
+
+    #
+    # Switches to given window and executes block, then switches back.
+    #
+    # @example
+    #   browser.window(title: "closeable window").use do
+    #     browser.a(id: "close").click
+    #   end
+    #
+
+    def use(&blk)
+      @browser.original_window ||= current_window
+      wait_for_exists
+      @driver.switch_to.window(handle, &blk)
+      self
+    end
+
+    protected
+
+    def handle
+      @handle ||= locate
+    end
+
+    # Referenced in EventuallyPresent
+    def selector_string
+      @selector.inspect
+    end
+
+    private
+
+    def locate
+      if @selector.empty?
+        nil
+      elsif @selector.key?(:index)
+        @driver.window_handles[Integer(@selector[:index])]
+      else
+        @driver.window_handles.find { |wh| matches?(wh) }
+      end
+    end
+
+    def assert_exists
+      raise(Exception::NoMatchingWindowFoundException, @selector.inspect) unless @driver.window_handles.include?(handle)
+    end
+
+    # return a handle to the currently active window if it is still open; otherwise nil
+    def current_window
+      @driver.window_handle
+    rescue Selenium::WebDriver::Error::NoSuchWindowError
+      nil
+    end
+
+    def matches?(handle)
+      @driver.switch_to.window(handle) {
+        matches_title = @selector[:title].nil? || @selector[:title] === @driver.title
+        matches_url   = @selector[:url].nil? || @selector[:url] === @driver.current_url
+
+        matches_title && matches_url
+      }
+    rescue Selenium::WebDriver::Error::NoSuchWindowError, Selenium::WebDriver::Error::NoSuchDriverError
+      # the window may disappear while we're iterating.
+      false
+    end
+
+    def wait_for_exists
+      return assert_exists unless Watir.relaxed_locate?
+      begin
+        wait_until(&:exists?)
+      rescue Wait::TimeoutError
+        raise Exception::NoMatchingWindowFoundException, @selector.inspect
+      end
+    end
+
+  end # Window
+end # Watir