watir 6.0.3 → 6.1.0

data/lib/watir/elements/svg_elements.rb

@@ -5,7 +5,7 @@ module Watir
     attribute(String, :style, :style)
     attribute(String, :ownersvg_element, :ownerSVGElement)
     attribute(String, :viewport_element, :viewportElement)
-    attribute(Fixnum, :tab_index, :tabIndex)
+    attribute(Integer, :tab_index, :tabIndex)
   end
   class SVGElementCollection < ElementCollection
   end
@@ -52,14 +52,14 @@ module Watir
     attribute(String, :view_target, :viewTarget)
     attribute(String, :view_box, :viewBox)
     attribute(String, :preserve_aspect_ratio, :preserveAspectRatio)
-    attribute(Fixnum, :zoom_and_pan, :zoomAndPan)
+    attribute(Integer, :zoom_and_pan, :zoomAndPan)
   end
   class ViewCollection < ElementCollection
   end
 
   class Cursor < SVGElement
-    attribute(Fixnum, :x, :x)
-    attribute(Fixnum, :y, :y)
+    attribute(Integer, :x, :x)
+    attribute(Integer, :y, :y)
     attribute(String, :href, :href)
   end
   class CursorCollection < ElementCollection
@@ -69,10 +69,10 @@ module Watir
     attribute(String, :pattern_units, :patternUnits)
     attribute(String, :pattern_content_units, :patternContentUnits)
     attribute(String, :pattern_transform, :patternTransform)
-    attribute(Fixnum, :x, :x)
-    attribute(Fixnum, :y, :y)
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
+    attribute(Integer, :x, :x)
+    attribute(Integer, :y, :y)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
     attribute(String, :view_box, :viewBox)
     attribute(String, :preserve_aspect_ratio, :preserveAspectRatio)
     attribute(String, :href, :href)
@@ -106,38 +106,38 @@ module Watir
   end
 
   class MeshGradient < Gradient
-    attribute(Fixnum, :x, :x)
-    attribute(Fixnum, :y, :y)
+    attribute(Integer, :x, :x)
+    attribute(Integer, :y, :y)
   end
   class MeshGradientCollection < ElementCollection
   end
 
   class RadialGradient < Gradient
-    attribute(Fixnum, :cx, :cx)
-    attribute(Fixnum, :cy, :cy)
-    attribute(Fixnum, :r, :r)
-    attribute(Fixnum, :fx, :fx)
-    attribute(Fixnum, :fy, :fy)
-    attribute(Fixnum, :fr, :fr)
+    attribute(Integer, :cx, :cx)
+    attribute(Integer, :cy, :cy)
+    attribute(Integer, :r, :r)
+    attribute(Integer, :fx, :fx)
+    attribute(Integer, :fy, :fy)
+    attribute(Integer, :fr, :fr)
   end
   class RadialGradientCollection < ElementCollection
   end
 
   class LinearGradient < Gradient
-    attribute(Fixnum, :x1, :x1)
-    attribute(Fixnum, :y1, :y1)
-    attribute(Fixnum, :x2, :x2)
-    attribute(Fixnum, :y2, :y2)
+    attribute(Integer, :x1, :x1)
+    attribute(Integer, :y1, :y1)
+    attribute(Integer, :x2, :x2)
+    attribute(Integer, :y2, :y2)
   end
   class LinearGradientCollection < ElementCollection
   end
 
   class Marker < SVGElement
-    attribute(Fixnum, :refx, :refX)
-    attribute(Fixnum, :refy, :refY)
+    attribute(Integer, :refx, :refX)
+    attribute(Integer, :refy, :refY)
     attribute(String, :marker_units, :markerUnits)
-    attribute(Fixnum, :marker_width, :markerWidth)
-    attribute(Fixnum, :marker_height, :markerHeight)
+    attribute(Integer, :marker_width, :markerWidth)
+    attribute(Integer, :marker_height, :markerHeight)
     attribute(String, :orient_type, :orientType)
     attribute(String, :orient_angle, :orientAngle)
     attribute(String, :orient, :orient)
@@ -174,23 +174,23 @@ module Watir
   end
 
   class ForeignObject < Graphics
-    attribute(Fixnum, :x, :x)
-    attribute(Fixnum, :y, :y)
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
+    attribute(Integer, :x, :x)
+    attribute(Integer, :y, :y)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
   end
   class ForeignObjectCollection < ElementCollection
   end
 
   class TextContent < Graphics
-    attribute(Fixnum, :text_length, :textLength)
+    attribute(Integer, :text_length, :textLength)
     attribute(String, :length_adjust, :lengthAdjust)
   end
   class TextContentCollection < ElementCollection
   end
 
   class TextPath < TextContent
-    attribute(Fixnum, :start_offset, :startOffset)
+    attribute(Integer, :start_offset, :startOffset)
     attribute(String, :method, :method)
     attribute(String, :spacing, :spacing)
     attribute(String, :href, :href)
@@ -221,10 +221,10 @@ module Watir
   end
 
   class Use < Graphics
-    attribute(Fixnum, :x, :x)
-    attribute(Fixnum, :y, :y)
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
+    attribute(Integer, :x, :x)
+    attribute(Integer, :y, :y)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
     attribute(String, :href, :href)
   end
   class UseCollection < ElementCollection
@@ -241,10 +241,10 @@ module Watir
   end
 
   class SVG < Graphics
-    attribute(Fixnum, :x, :x)
-    attribute(Fixnum, :y, :y)
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
+    attribute(Integer, :x, :x)
+    attribute(Integer, :y, :y)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
     attribute(String, :viewport, :viewport)
     attribute("Boolean", :use_current_view?, :useCurrentView)
     attribute(String, :current_view, :currentView)
@@ -252,7 +252,7 @@ module Watir
     attribute(String, :current_translate, :currentTranslate)
     attribute(String, :view_box, :viewBox)
     attribute(String, :preserve_aspect_ratio, :preserveAspectRatio)
-    attribute(Fixnum, :zoom_and_pan, :zoomAndPan)
+    attribute(Integer, :zoom_and_pan, :zoomAndPan)
   end
   class SVGCollection < ElementCollection
   end
@@ -277,38 +277,38 @@ module Watir
   end
 
   class Line < Geometry
-    attribute(Fixnum, :x1, :x1)
-    attribute(Fixnum, :y1, :y1)
-    attribute(Fixnum, :x2, :x2)
-    attribute(Fixnum, :y2, :y2)
+    attribute(Integer, :x1, :x1)
+    attribute(Integer, :y1, :y1)
+    attribute(Integer, :x2, :x2)
+    attribute(Integer, :y2, :y2)
   end
   class LineCollection < ElementCollection
   end
 
   class Ellipse < Geometry
-    attribute(Fixnum, :cx, :cx)
-    attribute(Fixnum, :cy, :cy)
-    attribute(Fixnum, :rx, :rx)
-    attribute(Fixnum, :ry, :ry)
+    attribute(Integer, :cx, :cx)
+    attribute(Integer, :cy, :cy)
+    attribute(Integer, :rx, :rx)
+    attribute(Integer, :ry, :ry)
   end
   class EllipseCollection < ElementCollection
   end
 
   class Circle < Geometry
-    attribute(Fixnum, :cx, :cx)
-    attribute(Fixnum, :cy, :cy)
-    attribute(Fixnum, :r, :r)
+    attribute(Integer, :cx, :cx)
+    attribute(Integer, :cy, :cy)
+    attribute(Integer, :r, :r)
   end
   class CircleCollection < ElementCollection
   end
 
   class Rect < Geometry
-    attribute(Fixnum, :x, :x)
-    attribute(Fixnum, :y, :y)
-    attribute(Fixnum, :width, :width)
-    attribute(Fixnum, :height, :height)
-    attribute(Fixnum, :rx, :rx)
-    attribute(Fixnum, :ry, :ry)
+    attribute(Integer, :x, :x)
+    attribute(Integer, :y, :y)
+    attribute(Integer, :width, :width)
+    attribute(Integer, :height, :height)
+    attribute(Integer, :rx, :rx)
+    attribute(Integer, :ry, :ry)
   end
   class RectCollection < ElementCollection
   end

data/lib/watir/elements/table.rb

@@ -30,7 +30,7 @@ module Watir
     #
     # Returns row of this table with given index.
     #
-    # @param [Fixnum] idx
+    # @param [Integer] idx
     # @return Watir::Row
     #
 

data/lib/watir/elements/table_section.rb

@@ -5,7 +5,7 @@ module Watir
     #
     # Returns table section row with given index.
     #
-    # @param [Fixnum] idx
+    # @param [Integer] idx
     #
 
     def [](idx)

data/lib/watir/generator/base/visitor.rb

@@ -133,7 +133,7 @@ module Watir
           String
         when 'UnsignedLong', 'Long', 'Integer', 'Short', 'UnsignedShort',
              'SVGAnimatedLength'
-          Fixnum
+          Integer
         when 'Float', /.*Double$/
           Float
         when 'Boolean'

data/lib/watir/legacy_wait.rb

@@ -74,7 +74,7 @@ module Watir
     #   browser.text_field(name: "new_user_first_name").when_present { |field| field.set "Watir" }
     #   browser.text_field(name: "new_user_first_name").when_present(60).text
     #
-    # @param [Fixnum] timeout seconds to wait before timing out
+    # @param [Integer] timeout seconds to wait before timing out
     #
     # @see Watir::Wait
     # @see Watir::Element#present?
@@ -102,7 +102,7 @@ module Watir
     # @example
     #   browser.button(name: "new_user_button_2").when_enabled.click
     #
-    # @param [Fixnum] timeout seconds to wait before timing out
+    # @param [Integer] timeout seconds to wait before timing out
     #
     # @see Watir::Wait
     # @see Watir::Element#enabled?

data/lib/watir/locators/element/locator.rb

@@ -132,17 +132,20 @@ module Watir
 
         def find_all_by_multiple
           selector = selector_builder.normalized_selector
+          visible = selector.delete(:visible)
 
           if selector.key? :index
             raise ArgumentError, "can't locate all elements by :index"
           end
 
           how, what = selector_builder.build(selector)
-          if how
-            @query_scope.wd.find_elements(how, what)
-          else
-            wd_find_by_regexp_selector(selector, :select)
-          end
+          found = if how
+                    @query_scope.wd.find_elements(how, what)
+                  else
+                    wd_find_by_regexp_selector(selector, :select)
+                  end
+          found.select! { |el| el.displayed? == visible } unless visible.nil?
+          found
         end
 
         def wd_find_all_by(how, what)

data/lib/watir/locators/element/selector_builder.rb

@@ -27,8 +27,8 @@ module Watir
         def check_type(how, what)
           case how
           when :index
-            unless what.is_a?(Fixnum)
-              raise TypeError, "expected Fixnum, got #{what.inspect}:#{what.class}"
+            unless what.is_a?(Integer)
+              raise TypeError, "expected Integer, got #{what.inspect}:#{what.class}"
             end
           when :visible
             unless what.is_a?(TrueClass) || what.is_a?(FalseClass)

data/lib/watir/wait.rb

@@ -29,20 +29,20 @@ module Watir
       # @example
       #   Watir::Wait.until { browser.text_field(name: "new_user_first_name").visible? }
       #
-      # @param [Fixnum] timeout How long to wait in seconds
+      # @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, object: nil)
+      def until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
         if deprecated_message || deprecated_timeout
           warn "Instead of passing arguments into Wait#until method, use keywords"
           timeout = deprecated_timeout
           message = deprecated_message
         end
         timeout ||= Watir.default_timeout
-        run_with_timer(timeout) do
+        run_with_timer(timeout, interval) do
           result = yield(object)
           return result if result
         end
@@ -55,20 +55,20 @@ module Watir
       # @example
       #   Watir::Wait.while { browser.text_field(name: "abrakadbra").present? }
       #
-      # @param [Fixnum] timeout How long to wait in seconds
+      # @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, object: nil)
+      def while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, object: nil)
         if deprecated_message || deprecated_timeout
           warn "Instead of passing arguments into Wait#while method, use keywords"
           timeout = deprecated_timeout
           message = deprecated_message
         end
         timeout ||= Watir.default_timeout
-        run_with_timer(timeout) { return unless yield(object) }
+        run_with_timer(timeout, interval) { return unless yield(object) }
         raise TimeoutError, message_for(timeout, message)
       end
 
@@ -81,13 +81,13 @@ module Watir
         err
       end
 
-      def run_with_timer(timeout, &block)
+      def run_with_timer(timeout, interval, &block)
         if timeout.zero?
           block.call
         else
           timer.wait(timeout) do
             block.call
-            sleep INTERVAL
+            sleep interval || INTERVAL
           end
         end
       end
@@ -111,18 +111,18 @@ module Watir
     #   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 [Fixnum] timeout seconds to wait before timing out
+    # @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, &blk)
+    def wait_until(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
       if deprecated_message || deprecated_timeout
         warn "Instead of passing arguments into #wait_until, use keywords"
         timeout = deprecated_timeout
         message = deprecated_message
       end
       message ||= "waiting for true condition on #{selector_string}"
-      Wait.until(timeout: timeout, message: message, object: self, &blk)
+      Wait.until(timeout: timeout, message: message, interval: interval, object: self, &blk)
 
       self
     end
@@ -137,18 +137,18 @@ module Watir
     #
     # @todo add element example
     #
-    # @param [Fixnum] timeout seconds to wait before timing out
+    # @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, &blk)
+    def wait_while(deprecated_timeout = nil, deprecated_message = nil, timeout: nil, message: nil, interval: nil, &blk)
       if deprecated_message || deprecated_timeout
         warn "Instead of passing arguments into #wait_while method, use keywords"
         timeout = deprecated_timeout
         message = deprecated_message
       end
       message ||= "waiting for false condition on #{selector_string}"
-      Wait.while(timeout: timeout, message: message, object: self, &blk)
+      Wait.while(timeout: timeout, message: message, interval: interval, object: self, &blk)
 
       self
     end
@@ -159,18 +159,18 @@ module Watir
     # @example
     #   browser.text_field(name: "new_user_first_name").wait_until_present
     #
-    # @param [Fixnum] timeout seconds to wait before timing out
+    # @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)
+    def wait_until_present(deprecated_timeout = nil, timeout: nil, interval: nil)
       if deprecated_timeout
         warn "Instead of passing arguments into #wait_until_present method, use keywords"
         timeout = deprecated_timeout
       end
-      wait_until(timeout: timeout, &:present?)
+      wait_until(timeout: timeout, interval: interval, &:present?)
     end
 
     #
@@ -179,7 +179,7 @@ module Watir
     # @example
     #   browser.text_field(name: "abrakadbra").wait_while_present
     #
-    # @param [Fixnum] timeout seconds to wait before timing out
+    # @param [Integer] timeout seconds to wait before timing out
     #
     # @see Watir::Wait
     # @see Watir::Element#present?

data/lib/watir/wait/timer.rb

@@ -8,7 +8,7 @@ module Watir
 
       #
       # Executes given block until it returns true or exceeds timeout.
-      # @param [Fixnum] timeout
+      # @param [Integer] timeout
       # @yield block
       # @api private
       #