selenium-webdriver 3.0.0.beta4.0 → 4.0.0.alpha5

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

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -47,16 +47,21 @@ module Selenium
       private
 
       def lock
-        max_time = Time.now + @timeout
+        max_time = current_time + @timeout
 
-        sleep 0.1 until can_lock? || Time.now >= max_time
+        sleep 0.1 until can_lock? || current_time >= max_time
 
         return if did_lock?
+
         raise Error::WebDriverError, "unable to bind to locking port #{@port} within #{@timeout} seconds"
       end
 
+      def current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
       def release
-        @server && @server.close
+        @server&.close
       end
 
       def can_lock?
@@ -64,8 +69,8 @@ module Selenium
         ChildProcess.close_on_exec @server
 
         true
-      rescue SocketError, Errno::EADDRINUSE, Errno::EBADF => ex
-        $stderr.puts "#{self}: #{ex.message}" if $DEBUG
+      rescue SocketError, Errno::EADDRINUSE, Errno::EBADF => e
+        WebDriver.logger.debug("#{self}: #{e.message}")
         false
       end
 

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

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -56,15 +56,18 @@ module Selenium
 
       CONNECT_TIMEOUT = 5
 
-      NOT_CONNECTED_ERRORS = [Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError]
-      NOT_CONNECTED_ERRORS << Errno::EPERM if Platform.cygwin?
+      NOT_CONNECTED_ERRORS = [Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError].tap { |arr|
+        arr << Errno::EPERM if Platform.cygwin?
+      }.freeze
 
-      CONNECTED_ERRORS = [Errno::EISCONN]
-      CONNECTED_ERRORS << Errno::EINVAL if Platform.windows?
+      CONNECTED_ERRORS = [Errno::EISCONN].tap { |arr|
+        arr << Errno::EINVAL if Platform.windows?
+        arr << Errno::EALREADY if Platform.wsl?
+      }.freeze
 
       if Platform.jruby?
-        # we use a plain TCPSocket here since JRuby has issues select()ing on a connecting socket
-        # see http://jira.codehaus.org/browse/JRUBY-5165
+        # we use a plain TCPSocket here since JRuby has issues closing socket
+        # see https://github.com/jruby/jruby/issues/5709
         def listening?
           TCPSocket.new(@host, @port).close
           true
@@ -80,7 +83,7 @@ module Selenium
           begin
             sock.connect_nonblock sockaddr
           rescue Errno::EINPROGRESS
-            retry if IO.select(nil, [sock], nil, CONNECT_TIMEOUT)
+            retry if socket_writable?(sock) && conn_completed?(sock)
             raise Errno::ECONNREFUSED
           rescue *CONNECTED_ERRORS
             # yay!
@@ -89,30 +92,34 @@ module Selenium
           sock.close
           true
         rescue *NOT_CONNECTED_ERRORS
-          sock.close if sock
-          $stderr.puts [@host, @port].inspect if $DEBUG
+          sock&.close
+          WebDriver.logger.debug("polling for socket on #{[@host, @port].inspect}")
           false
         end
       end
 
+      def socket_writable?(sock)
+        IO.select(nil, [sock], nil, CONNECT_TIMEOUT)
+      end
+
+      def conn_completed?(sock)
+        sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR).int.zero?
+      end
+
       def with_timeout
-        max_time = time_now + @timeout
+        max_time = current_time + @timeout
 
-        (
+        until current_time > max_time
           return true if yield
-          wait
-        ) until time_now > max_time
 
-        false
-      end
+          sleep @interval
+        end
 
-      def wait
-        sleep @interval
+        false
       end
 
-      # for testability
-      def time_now
-        Time.now
+      def current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
     end # SocketPoller
   end # WebDriver

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

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -57,10 +57,10 @@ module Selenium
       def window(id)
         if block_given?
           original = begin
-            @bridge.window_handle
-          rescue Error::NoSuchWindowError
-            nil
-          end
+                       @bridge.window_handle
+                     rescue Error::NoSuchWindowError
+                       nil
+                     end
 
           unless @bridge.window_handles.include? id
             raise Error::NoSuchWindowError, "The specified identifier '#{id}' is not found in the window handle list"

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

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information

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

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -43,19 +43,19 @@ module Selenium
       #
       # Wait until the given block returns a true value.
       #
-      # @raise [Error::TimeOutError]
+      # @raise [Error::TimeoutError]
       # @return [Object] the result of the block
       #
 
       def until
-        end_time = Time.now + @timeout
+        end_time = current_time + @timeout
         last_error = nil
 
-        until Time.now > end_time
+        until current_time > end_time
           begin
             result = yield
             return result if result
-          rescue *@ignored => last_error
+          rescue *@ignored => last_error # rubocop:disable Naming/RescuedExceptionsVariableName
             # swallowed
           end
 
@@ -65,12 +65,18 @@ module Selenium
         msg = if @message
                 @message.dup
               else
-                "timed out after #{@timeout} seconds"
+                +"timed out after #{@timeout} seconds"
               end
 
         msg << " (#{last_error.message})" if last_error
 
-        raise Error::TimeOutError, msg
+        raise Error::TimeoutError, msg
+      end
+
+      private
+
+      def current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
     end # Wait
   end # WebDriver

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

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -82,6 +82,34 @@ module Selenium
         @bridge.window_position
       end
 
+      #
+      # Sets the current window rect to the given point and position.
+      #
+      # @param [Selenium::WebDriver::Rectangle, #x, #y, #width, #height] rectangle The new rect.
+      #
+
+      def rect=(rectangle)
+        unless %w[x y width height].all? { |val| rectangle.respond_to? val }
+          raise ArgumentError, "expected #{rectangle.inspect}:#{rectangle.class}" \
+                               ' to respond to #x, #y, #width, and #height'
+        end
+
+        @bridge.set_window_rect(x: rectangle.x,
+                                y: rectangle.y,
+                                width: rectangle.width,
+                                height: rectangle.height)
+      end
+
+      #
+      # Get the rect of the current window.
+      #
+      # @return [Selenium::WebDriver::Rectangle] The rectangle.
+      #
+
+      def rect
+        @bridge.window_rect
+      end
+
       #
       # Equivalent to #size=, but accepts width and height arguments.
       #
@@ -115,6 +143,14 @@ module Selenium
         @bridge.maximize_window
       end
 
+      #
+      # Minimize the current window
+      #
+
+      def minimize
+        @bridge.minimize_window
+      end
+
       #
       # Make current window full screen
       #

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

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -52,9 +52,7 @@ module Selenium
         def zip(path)
           with_tmp_zip do |zip|
             ::Find.find(path) do |file|
-              unless File.directory?(file)
-                add_zip_entry zip, file, file.sub("#{path}/", '')
-              end
+              add_zip_entry zip, file, file.sub("#{path}/", '') unless File.directory?(file)
             end
 
             zip.commit

data/lib/selenium/webdriver/edge.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -19,32 +19,45 @@
 
 require 'net/http'
 
-require 'selenium/webdriver/edge/service'
-require 'selenium/webdriver/edge/bridge'
-
 module Selenium
   module WebDriver
-    module Edge
-      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
-        Unable to find MicrosoftWebDriver. Please download the server from
-        https://www.microsoft.com/en-us/download/details.aspx?id=48212 and place it
-        somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/MicrosoftWebDriver.
-      ERROR
+    module EdgeHtml
+      autoload :Driver, 'selenium/webdriver/edge_html/driver'
+      autoload :Options, 'selenium/webdriver/edge_html/options'
+      autoload :Service, 'selenium/webdriver/edge_html/service'
 
       def self.driver_path=(path)
-        Platform.assert_executable path
-        @driver_path = path
+        WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path=',
+                                   'Selenium::WebDriver::Edge::Service#driver_path=',
+                                   id: :driver_path
+        Selenium::WebDriver::Edge::Service.driver_path = path
       end
 
       def self.driver_path
-        @driver_path ||= begin
-          path = Platform.find_binary('MicrosoftWebDriver')
-          raise Error::WebDriverError, MISSING_TEXT unless path
-          Platform.assert_executable path
+        WebDriver.logger.deprecate 'Selenium::WebDriver::Edge#driver_path',
+                                   'Selenium::WebDriver::Edge::Service#driver_path',
+                                   id: :driver_path
+        Selenium::WebDriver::Edge::Service.driver_path
+      end
+    end # EdgeHtml
 
-          path
-        end
+    module EdgeChrome
+      autoload :Bridge, 'selenium/webdriver/edge_chrome/bridge'
+      autoload :Driver, 'selenium/webdriver/edge_chrome/driver'
+      autoload :Profile, 'selenium/webdriver/edge_chrome/profile'
+      autoload :Options, 'selenium/webdriver/edge_chrome/options'
+      autoload :Service, 'selenium/webdriver/edge_chrome/service'
+
+      def self.path=(path)
+        Platform.assert_executable path
+        @path = path
       end
-    end # Edge
+
+      def self.path
+        @path ||= nil
+      end
+    end # EdgeChrome
+
+    Edge = EdgeHtml # Alias EdgeHtml as Edge for now
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/edge_chrome/bridge.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'selenium/webdriver/chrome/bridge'
+
+module Selenium
+  module WebDriver
+    module EdgeChrome
+      module Bridge
+        include Selenium::WebDriver::Chrome::Bridge
+      end # Bridge
+    end # EdgeChrome
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/edge_chrome/driver.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Licensed to the Software Freedom Conservancy (SFC) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The SFC licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'selenium/webdriver/chrome/driver'
+
+module Selenium
+  module WebDriver
+    module EdgeChrome
+
+      #
+      # Driver implementation for EdgeChrome.
+      # @api private
+      #
+
+      class Driver < Selenium::WebDriver::Chrome::Driver
+        def browser
+          :edge_chrome
+        end
+      end # Driver
+    end # EdgeChrome
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/{common/driver_extensions/has_touch_screen.rb → edge_chrome/options.rb}

@@ -1,5 +1,5 @@
-# encoding: utf-8
-#
+# frozen_string_literal: true
+
 # Licensed to the Software Freedom Conservancy (SFC) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
@@ -17,20 +17,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'selenium/webdriver/chrome/options'
+
 module Selenium
   module WebDriver
-    module DriverExtensions
-      module HasTouchScreen
-        def touch
-          TouchActionBuilder.new mouse, keyboard, touch_screen
-        end
-
+    module EdgeChrome
+      class Options < Selenium::WebDriver::Chrome::Options
         private
 
-        def touch_screen
-          TouchScreen.new @bridge
+        def binary_path
+          EdgeChrome.path
         end
-      end # HasTouchScreen
-    end # DriverExtensions
+      end # Options
+    end # EdgeChrome
   end # WebDriver
 end # Selenium