watir 6.0.3 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b31273840de10dfe1602617e11a26791aeaa987c
-  data.tar.gz: 46d8f8dce7328f9c0a565b1192b76ff8a043c991
+  metadata.gz: 97b12fa8cee06abcdffeeefdb6a8455ad6abfdb2
+  data.tar.gz: 661c429b9dcf2eb4fe1ee856a7938c93ff3582d0
 SHA512:
-  metadata.gz: 9ef6b109c77b683ec6a6cc9d8fd539bb87538c8ebe5eda2d5991ca34edd4600f187ed4df7b353c73e9916dbb030308039cdd09eddc0ea17953be4540708aa002
-  data.tar.gz: f806448ab1781831144860d84640e2f85739f05b25d58e6094125aeab51b332ea5b2e372edeb1e1ba0f4fcf4fa762cd1a9197150cf7897109d354570858582af
+  metadata.gz: 69f706e5998202121957302950f0c71e14359032160924f066474c680f766635de7018f8eb470d6171e7993593c88beb883f1092ebe8fe3014d4d720e29d5cf9
+  data.tar.gz: d85aec3e1d158e6fd19ba5f176ce7711d762e7f2748faa686e4de8e28a8a687271efe711feee5fd2ac4e3fa26b6ded54c2cbfbdd46bd76695d443370a3ea8793

data/.travis.yml

@@ -1,8 +1,8 @@
 sudo: false
 rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 addons:
   firefox: latest
   apt:

data/CHANGES.md

@@ -1,3 +1,11 @@
+### 6.1.0 (2017-01-04)
+
+* Add Ruby 2.4.0 support (thanks Robert MacCracken)
+* Implement polling interval parameter for wait methods
+* Implement visible locator for element collections
+* Implement automatic waiting for selecting options in a select list
+* Fix bug allowing `StaleElementReferenceError` in `#wait_while_present` calls
+
 ### 6.0.3 (2016-12-22)
 
 * No notable changes, only includes fixes for WatirSpec

data/LICENSE

@@ -1,7 +1,7 @@
 (the MIT License)
 
 Copyright (c) 2009-2015 Jari Bakken
-Copyright (c) 2015-2016 Alex Rodionov, Titus Fortner
+Copyright (c) 2015-2017 Alex Rodionov, Titus Fortner
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -102,5 +102,5 @@ rake yard:doctest
 ## Copyright
 
 Copyright (c) 2009-2015 Jari Bakken
-Copyright (c) 2015-2016 Alex Rodionov, Titus Fortner
+Copyright (c) 2015-2017 Alex Rodionov, Titus Fortner
 See LICENSE for details

data/lib/watir/after_hooks.rb

@@ -109,7 +109,7 @@ module Watir
     #   browser.after_hooks.length
     #   #=> 1
     #
-    # @return [Fixnum]
+    # @return [Integer]
     #
 
     def length
@@ -120,7 +120,7 @@ module Watir
     #
     # Gets the after hook at the given index.
     #
-    # @param [Fixnum] index
+    # @param [Integer] index
     # @return [#call]
     #
 

data/lib/watir/attribute_helper.rb

@@ -57,7 +57,7 @@ module Watir
         define_string_attribute(name, attr)
       when 'Boolean'
         define_boolean_attribute(name, attr)
-      when 'Fixnum'
+      when 'Integer'
         define_int_attribute(name, attr)
       when 'Float'
         define_float_attribute(name, attr)

data/lib/watir/browser.rb

@@ -210,7 +210,7 @@ module Watir
     # @example
     #   browser.wait
     #
-    # @param [Fixnum] timeout
+    # @param [Integer] timeout
     # @raise [Watir::Wait::TimeoutError] if timeout is exceeded
     #
 

data/lib/watir/element_collection.rb

@@ -31,7 +31,7 @@ module Watir
     #
     # Returns number of elements in collection.
     #
-    # @return [Fixnum]
+    # @return [Integer]
     #
 
     def length
@@ -45,7 +45,7 @@ module Watir
     # Also note that because of Watir's lazy loading, this will return an Element
     # instance even if the index is out of bounds.
     #
-    # @param [Fixnum] idx Index of wanted element, 0-indexed
+    # @param [Integer] idx Index of wanted element, 0-indexed
     # @return [Watir::Element] Returns an instance of a Watir::Element subclass
     #
 

data/lib/watir/elements/element.rb

@@ -201,8 +201,8 @@ module Watir
     # @example
     #   browser.div(id: "draggable").drag_and_drop_by 100, -200
     #
-    # @param [Fixnum] right_by
-    # @param [Fixnum] down_by
+    # @param [Integer] right_by
+    # @param [Integer] down_by
     #
 
     def drag_and_drop_by(right_by, down_by)
@@ -382,8 +382,7 @@ module Watir
     #
 
     def visible?
-      assert_exists
-      @element.displayed?
+      element_call(:assert_exists) { @element.displayed? }
     end
 
     #
@@ -394,8 +393,7 @@ module Watir
     #
 
     def enabled?
-      assert_exists
-      @element.enabled?
+      element_call(:assert_exists) { @element.enabled? }
     end
 
     #

data/lib/watir/elements/html_elements.rb

@@ -14,7 +14,7 @@ module Watir
     attribute(String, :properties, :properties)
     attribute(String, :item_value, :itemValue)
     attribute("Boolean", :hidden?, :hidden)
-    attribute(Fixnum, :tab_index, :tabIndex)
+    attribute(Integer, :tab_index, :tabIndex)
     attribute(String, :access_key, :accessKey)
     attribute(String, :access_key_label, :accessKeyLabel)
     attribute("Boolean", :draggable?, :draggable)
@@ -134,12 +134,12 @@ module Watir
     attribute(String, :bg_color, :bgColor)
     attribute(String, :direction, :direction)
     attribute(String, :height, :height)
-    attribute(Fixnum, :hspace, :hspace)
-    attribute(Fixnum, :loop, :loop)
-    attribute(Fixnum, :scroll_amount, :scrollAmount)
-    attribute(Fixnum, :scroll_delay, :scrollDelay)
+    attribute(Integer, :hspace, :hspace)
+    attribute(Integer, :loop, :loop)
+    attribute(Integer, :scroll_amount, :scrollAmount)
+    attribute(Integer, :scroll_delay, :scrollDelay)
     attribute("Boolean", :true_speed?, :trueSpeed)
-    attribute(Fixnum, :vspace, :vspace)
+    attribute(Integer, :vspace, :vspace)
     attribute(String, :width, :width)
     attribute(String, :onbounce, :onbounce)
     attribute(String, :onfinish, :onfinish)
@@ -155,18 +155,18 @@ module Watir
     attribute(String, :code, :code)
     attribute(String, :code_base, :codeBase)
     attribute(String, :height, :height)
-    attribute(Fixnum, :hspace, :hspace)
+    attribute(Integer, :hspace, :hspace)
     attribute(String, :name, :name)
     attribute(String, :object, :object)
-    attribute(Fixnum, :vspace, :vspace)
+    attribute(Integer, :vspace, :vspace)
     attribute(String, :width, :width)
   end
   class AppletCollection < ElementCollection
   end
 
   class Canvas < HTMLElement
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
   end
   class CanvasCollection < ElementCollection
   end
@@ -298,13 +298,13 @@ module Watir
   class TextArea < HTMLElement
     attribute(String, :autocomplete, :autocomplete)
     attribute("Boolean", :autofocus?, :autofocus)
-    attribute(Fixnum, :cols, :cols)
+    attribute(Integer, :cols, :cols)
     attribute(String, :dir_name, :dirName)
     attribute("Boolean", :disabled?, :disabled)
     attribute(String, :form, :form)
     attribute(String, :input_mode, :inputMode)
-    attribute(Fixnum, :max_length, :maxLength)
-    attribute(Fixnum, :min_length, :minLength)
+    attribute(Integer, :max_length, :maxLength)
+    attribute(Integer, :min_length, :minLength)
     attribute(String, :name, :name)
     attribute(String, :placeholder, :placeholder)
     attribute("Boolean", :read_only?, :readOnly)
@@ -313,13 +313,13 @@ module Watir
     attribute(String, :type, :type)
     attribute(String, :default_value, :defaultValue)
     attribute(String, :value, :value)
-    attribute(Fixnum, :text_length, :textLength)
+    attribute(Integer, :text_length, :textLength)
     attribute("Boolean", :will_validate?, :willValidate)
     attribute(String, :validity, :validity)
     attribute(String, :validation_message, :validationMessage)
     attribute(String, :labels, :labels)
-    attribute(Fixnum, :selection_start, :selectionStart)
-    attribute(Fixnum, :selection_end, :selectionEnd)
+    attribute(Integer, :selection_start, :selectionStart)
+    attribute(Integer, :selection_end, :selectionEnd)
     attribute(String, :selection_direction, :selectionDirection)
   end
   class TextAreaCollection < ElementCollection
@@ -332,7 +332,7 @@ module Watir
     attribute("Boolean", :default_selected?, :defaultSelected)
     attribute("Boolean", :selected?, :selected)
     attribute(String, :value, :value)
-    attribute(Fixnum, :index, :index)
+    attribute(Integer, :index, :index)
   end
   class OptionCollection < ElementCollection
   end
@@ -358,12 +358,12 @@ module Watir
     attribute("Boolean", :multiple?, :multiple)
     attribute(String, :name, :name)
     attribute("Boolean", :required?, :required)
-    attribute(Fixnum, :size, :size)
+    attribute(Integer, :size, :size)
     attribute(String, :type, :type)
     attribute(String, :options, :options)
-    attribute(Fixnum, :length, :length)
+    attribute(Integer, :length, :length)
     attribute(String, :selected_options, :selectedOptions)
-    attribute(Fixnum, :selected_index, :selectedIndex)
+    attribute(Integer, :selected_index, :selectedIndex)
     attribute(String, :value, :value)
     attribute("Boolean", :will_validate?, :willValidate)
     attribute(String, :validity, :validity)
@@ -410,21 +410,21 @@ module Watir
     attribute(String, :form_method, :formMethod)
     attribute("Boolean", :form_no_validate?, :formNoValidate)
     attribute(String, :form_target, :formTarget)
-    attribute(Fixnum, :height, :height)
+    attribute(Integer, :height, :height)
     attribute("Boolean", :indeterminate?, :indeterminate)
     attribute(String, :input_mode, :inputMode)
     attribute(String, :list, :list)
     attribute(String, :max, :max)
-    attribute(Fixnum, :max_length, :maxLength)
+    attribute(Integer, :max_length, :maxLength)
     attribute(String, :min, :min)
-    attribute(Fixnum, :min_length, :minLength)
+    attribute(Integer, :min_length, :minLength)
     attribute("Boolean", :multiple?, :multiple)
     attribute(String, :name, :name)
     attribute(String, :pattern, :pattern)
     attribute(String, :placeholder, :placeholder)
     attribute("Boolean", :read_only?, :readOnly)
     attribute("Boolean", :required?, :required)
-    attribute(Fixnum, :size, :size)
+    attribute(Integer, :size, :size)
     attribute(String, :src, :src)
     attribute(String, :step, :step)
     attribute(String, :type, :type)
@@ -434,13 +434,13 @@ module Watir
     attribute(Float, :value_as_number, :valueAsNumber)
     attribute(Float, :value_low, :valueLow)
     attribute(Float, :value_high, :valueHigh)
-    attribute(Fixnum, :width, :width)
+    attribute(Integer, :width, :width)
     attribute("Boolean", :will_validate?, :willValidate)
     attribute(String, :validity, :validity)
     attribute(String, :validation_message, :validationMessage)
     attribute(String, :labels, :labels)
-    attribute(Fixnum, :selection_start, :selectionStart)
-    attribute(Fixnum, :selection_end, :selectionEnd)
+    attribute(Integer, :selection_start, :selectionStart)
+    attribute(Integer, :selection_end, :selectionEnd)
     attribute(String, :selection_direction, :selectionDirection)
     attribute(String, :align, :align)
     attribute(String, :use_map, :useMap)
@@ -466,16 +466,16 @@ module Watir
     attribute(String, :name, :name)
     attribute("Boolean", :no_validate?, :noValidate)
     attribute(String, :target, :target)
-    attribute(Fixnum, :length, :length)
+    attribute(Integer, :length, :length)
   end
   class FormCollection < ElementCollection
   end
 
   class TableCell < HTMLElement
-    attribute(Fixnum, :col_span, :colSpan)
-    attribute(Fixnum, :row_span, :rowSpan)
+    attribute(Integer, :col_span, :colSpan)
+    attribute(Integer, :row_span, :rowSpan)
     attribute(String, :headers, :headers)
-    attribute(Fixnum, :cell_index, :cellIndex)
+    attribute(Integer, :cell_index, :cellIndex)
     attribute(String, :align, :align)
     attribute(String, :axis, :axis)
     attribute(String, :height, :height)
@@ -504,8 +504,8 @@ module Watir
   end
 
   class TableRow < HTMLElement
-    attribute(Fixnum, :row_index, :rowIndex)
-    attribute(Fixnum, :section_row_index, :sectionRowIndex)
+    attribute(Integer, :row_index, :rowIndex)
+    attribute(Integer, :section_row_index, :sectionRowIndex)
     attribute(String, :align, :align)
     attribute(String, :ch, :ch)
     attribute(String, :ch_off, :chOff)
@@ -589,10 +589,10 @@ module Watir
     attribute(String, :src_object, :srcObject)
     attribute(String, :current_src, :currentSrc)
     attribute(String, :cross_origin, :crossOrigin)
-    attribute(Fixnum, :network_state, :networkState)
+    attribute(Integer, :network_state, :networkState)
     attribute(String, :preload, :preload)
     attribute(String, :buffered, :buffered)
-    attribute(Fixnum, :ready_state, :readyState)
+    attribute(Integer, :ready_state, :readyState)
     attribute("Boolean", :seeking?, :seeking)
     attribute(Float, :current_time, :currentTime)
     attribute(Float, :duration, :duration)
@@ -623,10 +623,10 @@ module Watir
   end
 
   class Video < Media
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
-    attribute(Fixnum, :video_width, :videoWidth)
-    attribute(Fixnum, :video_height, :videoHeight)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
+    attribute(Integer, :video_width, :videoWidth)
+    attribute(Integer, :video_height, :videoHeight)
     attribute(String, :poster, :poster)
   end
   class VideoCollection < ElementCollection
@@ -638,7 +638,7 @@ module Watir
     attribute(String, :srclang, :srclang)
     attribute(String, :label, :label)
     attribute("Boolean", :default?, :default)
-    attribute(Fixnum, :ready_state, :readyState)
+    attribute(Integer, :ready_state, :readyState)
     attribute(String, :track, :track)
   end
   class TrackCollection < ElementCollection
@@ -671,9 +671,9 @@ module Watir
     attribute(String, :archive, :archive)
     attribute(String, :code, :code)
     attribute("Boolean", :declare?, :declare)
-    attribute(Fixnum, :hspace, :hspace)
+    attribute(Integer, :hspace, :hspace)
     attribute(String, :standby, :standby)
-    attribute(Fixnum, :vspace, :vspace)
+    attribute(Integer, :vspace, :vspace)
     attribute(String, :code_base, :codeBase)
     attribute(String, :code_type, :codeType)
     attribute(String, :border, :border)
@@ -721,17 +721,17 @@ module Watir
     attribute(String, :cross_origin, :crossOrigin)
     attribute(String, :use_map, :useMap)
     attribute("Boolean", :map?, :isMap)
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
-    attribute(Fixnum, :natural_width, :naturalWidth)
-    attribute(Fixnum, :natural_height, :naturalHeight)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
+    attribute(Integer, :natural_width, :naturalWidth)
+    attribute(Integer, :natural_height, :naturalHeight)
     attribute("Boolean", :complete?, :complete)
     attribute(String, :current_src, :currentSrc)
     attribute(String, :name, :name)
     attribute(String, :lowsrc, :lowsrc)
     attribute(String, :align, :align)
-    attribute(Fixnum, :hspace, :hspace)
-    attribute(Fixnum, :vspace, :vspace)
+    attribute(Integer, :hspace, :hspace)
+    attribute(Integer, :vspace, :vspace)
     attribute(String, :long_desc, :longDesc)
     attribute(String, :border, :border)
   end
@@ -813,7 +813,7 @@ module Watir
   end
 
   class LI < HTMLElement
-    attribute(Fixnum, :value, :value)
+    attribute(Integer, :value, :value)
     attribute(String, :type, :type)
   end
   class LICollection < ElementCollection
@@ -828,7 +828,7 @@ module Watir
 
   class OList < HTMLElement
     attribute("Boolean", :reversed?, :reversed)
-    attribute(Fixnum, :start, :start)
+    attribute(Integer, :start, :start)
     attribute(String, :type, :type)
     attribute("Boolean", :compact?, :compact)
   end
@@ -842,7 +842,7 @@ module Watir
   end
 
   class Pre < HTMLElement
-    attribute(Fixnum, :width, :width)
+    attribute(Integer, :width, :width)
   end
   class PreCollection < ElementCollection
   end

data/lib/watir/elements/image.rb

@@ -19,7 +19,7 @@ module Watir
     #
     # Returns the image's width in pixels.
     #
-    # @return [Fixnum] width
+    # @return [Integer] width
     #
 
     def width

data/lib/watir/elements/select.rb

@@ -20,9 +20,8 @@ module Watir
     # @return [Watir::OptionCollection]
     #
 
-    def options
-      wait_for_exists
-      super
+    def options(*)
+      element_call(:wait_for_exists) { super }
     end
 
     #
@@ -119,85 +118,36 @@ module Watir
     private
 
     def select_by(how, str_or_rx)
-      case str_or_rx
-      when String, Numeric
-        select_by_string(how, str_or_rx.to_s)
-      when Regexp
-        select_by_regexp(how, str_or_rx)
-      else
-        raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
-      end
-    end
-
-    def select_by_string(how, string)
-      xpath = option_xpath_for(how, string)
-
-      if multiple?
-        elements = element_call do
-          @element.find_elements(:xpath, xpath)
+      found = nil
+      begin
+        Wait.until do
+          case str_or_rx
+          when String, Numeric, Regexp
+            found = options(how => str_or_rx)
+            found = options(label: str_or_rx) if found.to_a.empty?
+          else
+            raise TypeError, "expected String or Regexp, got #{str_or_rx.inspect}:#{str_or_rx.class}"
+           end
+          !found.to_a.empty?
         end
-        no_value_found(string) if elements.empty?
-
-        elements.each { |e| click_option(e) unless e.selected? }
-        elements.first.text
-      else
-        begin
-          e = element_call do
-            @element.find_element(:xpath, xpath)
-          end
-        rescue Selenium::WebDriver::Error::NoSuchElementError
-          no_value_found(string)
-        end
-
-        click_option(e) unless e.selected?
-        safe_text(e)
+      rescue Wait::TimeoutError
+        no_value_found(str_or_rx)
       end
+      select_matching(found)
     end
 
-    def select_by_regexp(how, exp)
-      elements = element_call do
-        @element.find_elements(:tag_name, 'option')
-      end
-      no_value_found(nil, "no options in select list") if elements.empty?
-
-      if multiple?
-        found = elements.select do |e|
-          next unless matches_regexp?(how, e, exp)
-          click_option(e) unless e.selected?
-          true
-        end
-
-        no_value_found(exp) if found.empty?
-
-        found.first.text
-      else
-        element = elements.find { |e| matches_regexp?(how, e, exp) }
-        no_value_found(exp) unless element
-
-        click_option(element) unless element.selected?
-        safe_text(element)
-      end
-    end
-
-    def option_xpath_for(how, string)
-      string = XpathSupport.escape string
-
-      case how
-      when :text
-        ".//option[normalize-space()=#{string} or @label=#{string}]"
-      when :value
-        ".//option[@value=#{string}]"
-      else
-        raise Error, "unknown how: #{how.inspect}"
-      end
+    def select_matching(elements)
+      elements = [elements.first] unless multiple?
+      elements.each { |e| click_option(e) unless e.selected? }
+      elements.first.exist? ? elements.first.text : ''
     end
 
     def matches_regexp?(how, element, exp)
       case how
       when :text
-        element.text =~ exp || element.attribute(:label) =~ exp
+        element.text =~ exp || element.label =~ exp
       when :value
-        element.attribute(:value) =~ exp
+        element.value =~ exp
       else
         raise Error, "unknown how: #{how.inspect}"
       end
@@ -208,13 +158,6 @@ module Watir
       element.click
     end
 
-    def safe_text(element)
-      element.text
-    rescue Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::UnhandledAlertError
-      # guard for scenario where selecting the element changes the page, making our element obsolete
-      ''
-    end
-
     def no_value_found(arg, msg = nil)
       raise NoValueFoundException, msg || "#{arg.inspect} not found in select list"
     end