selenium-webdriver 2.53.4 → 3.0.0.beta1

data/lib/selenium/webdriver/common/socket_poller.rb

@@ -23,7 +23,6 @@ require 'socket'
 module Selenium
   module WebDriver
     class SocketPoller
-
       def initialize(host, port, timeout = 0, interval = 0.25)
         @host     = host
         @port     = Integer(port)
@@ -50,7 +49,7 @@ module Selenium
       #
 
       def closed?
-        with_timeout { not listening? }
+        with_timeout { !listening? }
       end
 
       private
@@ -81,11 +80,8 @@ module Selenium
           begin
             sock.connect_nonblock sockaddr
           rescue Errno::EINPROGRESS
-            if IO.select(nil, [sock], nil, CONNECT_TIMEOUT)
-              retry
-            else
-              raise Errno::ECONNREFUSED
-            end
+            retry if IO.select(nil, [sock], nil, CONNECT_TIMEOUT)
+            raise Errno::ECONNREFUSED
           rescue *CONNECTED_ERRORS
             # yay!
           end
@@ -99,7 +95,7 @@ module Selenium
         end
       end
 
-      def with_timeout(&blk)
+      def with_timeout
         max_time = time_now + @timeout
 
         (
@@ -118,7 +114,6 @@ module Selenium
       def time_now
         Time.now
       end
-
     end # SocketPoller
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/target_locator.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class TargetLocator
-
       #
       # @api private
       #
@@ -34,7 +33,7 @@ module Selenium
       #
 
       def frame(id)
-        @bridge.switchToFrame id
+        @bridge.switch_to_frame id
       end
 
       #
@@ -42,7 +41,7 @@ module Selenium
       #
 
       def parent_frame
-        @bridge.switchToParentFrame
+        @bridge.switch_to_parent_frame
       end
 
       #
@@ -58,27 +57,27 @@ module Selenium
       def window(id)
         if block_given?
           original = begin
-            @bridge.getCurrentWindowHandle
+            @bridge.window_handle
           rescue Error::NoSuchWindowError
             nil
           end
 
-          unless @bridge.getWindowHandles.include? id
+          unless @bridge.window_handles.include? id
             raise Error::NoSuchWindowError, "The specified identifier '#{id}' is not found in the window handle list"
           end
 
-          @bridge.switchToWindow id
+          @bridge.switch_to_window id
 
           begin
             returned = yield
           ensure
-            current_handles = @bridge.getWindowHandles
+            current_handles = @bridge.window_handles
             original = current_handles.first unless current_handles.include? original
-            @bridge.switchToWindow original
+            @bridge.switch_to_window original
             returned
           end
         else
-          @bridge.switchToWindow id
+          @bridge.switch_to_window id
         end
       end
 
@@ -89,7 +88,7 @@ module Selenium
       #
 
       def active_element
-        @bridge.switchToActiveElement
+        @bridge.switch_to_active_element
       end
 
       #
@@ -97,7 +96,7 @@ module Selenium
       #
 
       def default_content
-        @bridge.switchToDefaultContent
+        @bridge.switch_to_default_content
       end
 
       #
@@ -107,7 +106,6 @@ module Selenium
       def alert
         Alert.new(@bridge)
       end
-
     end # TargetLocator
   end # WebDriver
-end  # Selenium
+end # Selenium

data/lib/selenium/webdriver/common/timeouts.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class Timeouts
-
       def initialize(bridge)
         @bridge = bridge
       end
@@ -30,7 +29,7 @@ module Selenium
       #
 
       def implicit_wait=(seconds)
-        @bridge.setImplicitWaitTimeout Integer(seconds * 1000)
+        @bridge.implicit_wait_timeout = Integer(seconds * 1000)
       end
 
       #
@@ -40,7 +39,7 @@ module Selenium
       #
 
       def script_timeout=(seconds)
-        @bridge.setScriptTimeout Integer(seconds * 1000)
+        @bridge.script_timeout = Integer(seconds * 1000)
       end
 
       #
@@ -49,9 +48,8 @@ module Selenium
       #
 
       def page_load=(seconds)
-        @bridge.setTimeout 'page load', Integer(seconds * 1000)
+        @bridge.timeout 'page load', Integer(seconds * 1000)
       end
-
     end # Timeouts
   end # WebDriver
-end # Selenium
+end # Selenium

data/lib/selenium/webdriver/common/touch_action_builder.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class TouchActionBuilder < ActionBuilder
-
       #
       # @api private
       #
@@ -31,7 +30,7 @@ module Selenium
       end
 
       def scroll(*args)
-        unless [2,3].include? args.size
+        unless [2, 3].include? args.size
           raise ArgumentError, "wrong number of arguments, expected 2..3, got #{args.size}"
         end
 
@@ -40,7 +39,7 @@ module Selenium
       end
 
       def flick(*args)
-        unless [2,4].include? args.size
+        unless [2, 4].include? args.size
           raise ArgumentError, "wrong number of arguments, expected 2 or 4, got #{args.size}"
         end
 
@@ -77,7 +76,6 @@ module Selenium
         @actions << [:touch_screen, :move, [x, y]]
         self
       end
-
     end # TouchActionBuilder
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/touch_screen.rb

@@ -20,8 +20,7 @@
 module Selenium
   module WebDriver
     class TouchScreen
-      FLICK_SPEED = { :normal => 0, :fast => 1}
-
+      FLICK_SPEED = {normal: 0, fast: 1}.freeze
 
       #
       # @api private
@@ -33,43 +32,43 @@ module Selenium
 
       def single_tap(element)
         assert_element element
-        @bridge.touchSingleTap element.ref
+        @bridge.touch_single_tap element.ref
       end
 
       def double_tap(element)
         assert_element element
-        @bridge.touchDoubleTap element.ref
+        @bridge.touch_double_tap element.ref
       end
 
       def long_press(element)
         assert_element element
-        @bridge.touchLongPress element.ref
+        @bridge.touch_long_press element.ref
       end
 
       def down(x, y = nil)
         x, y = coords_from x, y
-        @bridge.touchDown x, y
+        @bridge.touch_down x, y
       end
 
       def up(x, y = nil)
         x, y = coords_from x, y
-        @bridge.touchUp x, y
+        @bridge.touch_up x, y
       end
 
       def move(x, y = nil)
         x, y = coords_from x, y
-        @bridge.touchMove x, y
+        @bridge.touch_move x, y
       end
 
       def scroll(*args)
         case args.size
         when 2
           x_offset, y_offset = args
-          @bridge.touchScroll nil, Integer(x_offset), Integer(y_offset)
+          @bridge.touch_scroll nil, Integer(x_offset), Integer(y_offset)
         when 3
           element, x_offset, y_offset = args
           assert_element element
-          @bridge.touchScroll element.ref, Integer(x_offset), Integer(y_offset)
+          @bridge.touch_scroll element.ref, Integer(x_offset), Integer(y_offset)
         else
           raise ArgumentError, "wrong number of arguments, expected 2..3, got #{args.size}"
         end
@@ -79,7 +78,7 @@ module Selenium
         case args.size
         when 2
           x_speed, y_speed = args
-          @bridge.touchFlick Integer(x_speed), Integer(y_speed)
+          @bridge.touch_flick Integer(x_speed), Integer(y_speed)
         when 4
           element, xoffset, yoffset, speed = args
 
@@ -90,11 +89,10 @@ module Selenium
             raise ArgumentError, "expected one of #{FLICK_SPEED.keys.inspect}, got #{speed.inspect}"
           end
 
-          @bridge.touchElementFlick element.ref, Integer(xoffset), Integer(yoffset), flick_speed
+          @bridge.touch_element_flick element.ref, Integer(xoffset), Integer(yoffset), flick_speed
         else
           raise ArgumentError, "wrong number of arguments, expected 2 or 4, got #{args.size}"
         end
-
       end
 
       private
@@ -107,18 +105,17 @@ module Selenium
             raise ArgumentError, "expected #{point.inspect} to respond to :x and :y"
           end
 
-          x, y = point.x, point.y
+          x = point.x
+          y = point.y
         end
 
         [Integer(x), Integer(y)]
       end
 
       def assert_element(element)
-        unless element.kind_of? Element
-          raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
-        end
+        return if element.is_a? Element
+        raise TypeError, "expected #{Element}, got #{element.inspect}:#{element.class}"
       end
-
     end # TouchScreen
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/w3c_error.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     module Error
-
       class WebDriverError < StandardError; end
 
       #
@@ -71,7 +70,7 @@ module Selenium
 
       #
       # Occurs if the given session id is not in the list of active sessions,
-      # meaning the session either does not exist or that it’s not active.
+      # meaning the session either does not exist or that it's not active.
       #
 
       class InvalidSessionIdError < WebDriverError; end
@@ -83,7 +82,7 @@ module Selenium
       class JavascriptError < WebDriverError; end
 
       #
-      # The target for mouse interaction is not in the browser’s viewport and
+      # The target for mouse interaction is not in the browser's viewport and
       # cannot be brought into that viewport.
       #
 
@@ -142,7 +141,7 @@ module Selenium
       class TimeoutError < WebDriverError; end
 
       #
-      # A request to set a cookie’s value could not be satisfied.
+      # A request to set a cookie's value could not be satisfied.
       #
 
       class UnableToSetCookieError < WebDriverError; end
@@ -187,8 +186,6 @@ module Selenium
       UnexpectedJavascriptError = JavascriptError
       NoAlertOpenError          = NoAlertPresentError
       ElementNotDisplayedError  = ElementNotVisibleError
-
-
     end # Error
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/common/wait.rb

@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class Wait
-
       DEFAULT_TIMEOUT  = 5
       DEFAULT_INTERVAL = 0.2
 
@@ -41,7 +40,6 @@ module Selenium
         @ignored  = Array(opts[:ignore] || Error::NoSuchElementError)
       end
 
-
       #
       # Wait until the given block returns a true value.
       #
@@ -49,7 +47,7 @@ module Selenium
       # @return [Object] the result of the block
       #
 
-      def until(&blk)
+      def until
         end_time = Time.now + @timeout
         last_error = nil
 
@@ -64,19 +62,16 @@ module Selenium
           sleep @interval
         end
 
-
-        if @message
-          msg = @message.dup
-        else
-          msg = "timed out after #{@timeout} seconds"
-        end
+        msg = if @message
+                @message.dup
+              else
+                "timed out after #{@timeout} seconds"
+              end
 
         msg << " (#{last_error.message})" if last_error
 
         raise Error::TimeOutError, msg
       end
-
     end # Wait
   end # WebDriver
 end # Selenium
-

data/lib/selenium/webdriver/common/window.rb

@@ -19,13 +19,11 @@
 
 module Selenium
   module WebDriver
-
     #
     # @api beta This API may be changed or removed in a future release.
     #
 
     class Window
-
       #
       # @api private
       #
@@ -42,11 +40,11 @@ module Selenium
 
       def size=(dimension)
         unless dimension.respond_to?(:width) && dimension.respond_to?(:height)
-          raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class}" +
-                                " to respond to #width and #height"
+          raise ArgumentError, "expected #{dimension.inspect}:#{dimension.class}" \
+                               ' to respond to #width and #height'
         end
 
-        @bridge.setWindowSize dimension.width, dimension.height
+        @bridge.resize_window dimension.width, dimension.height
       end
 
       #
@@ -56,7 +54,7 @@ module Selenium
       #
 
       def size
-        @bridge.getWindowSize
+        @bridge.window_size
       end
 
       #
@@ -67,11 +65,11 @@ module Selenium
 
       def position=(point)
         unless point.respond_to?(:x) && point.respond_to?(:y)
-          raise ArgumentError, "expected #{point.inspect}:#{point.class}" +
-                                " to respond to #x and #y"
+          raise ArgumentError, "expected #{point.inspect}:#{point.class}" \
+                               ' to respond to #x and #y'
         end
 
-        @bridge.setWindowPosition point.x, point.y
+        @bridge.reposition_window point.x, point.y
       end
 
       #
@@ -81,7 +79,7 @@ module Selenium
       #
 
       def position
-        @bridge.getWindowPosition
+        @bridge.window_position
       end
 
       #
@@ -94,7 +92,7 @@ module Selenium
       #
 
       def resize_to(width, height)
-        @bridge.setWindowSize Integer(width), Integer(height)
+        @bridge.resize_window Integer(width), Integer(height)
       end
 
       #
@@ -106,7 +104,7 @@ module Selenium
       #
 
       def move_to(x, y)
-        @bridge.setWindowPosition Integer(x), Integer(y)
+        @bridge.reposition_window Integer(x), Integer(y)
       end
 
       #
@@ -114,7 +112,7 @@ module Selenium
       #
 
       def maximize
-        @bridge.maximizeWindow
+        @bridge.maximize_window
       end
 
       #
@@ -122,9 +120,8 @@ module Selenium
       #
 
       def full_screen
-        @bridge.fullscreenWindow
+        @bridge.full_screen_window
       end
-
     end # Window
   end # WebDriver
 end # Selenium