selenium-webdriver 2.53.3 → 3.142.7

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
@@ -20,7 +20,6 @@
 module Selenium
   module WebDriver
     class Wait
-
       DEFAULT_TIMEOUT  = 5
       DEFAULT_INTERVAL = 0.2
 
@@ -41,19 +40,18 @@ module Selenium
         @ignored  = Array(opts[:ignore] || Error::NoSuchElementError)
       end
 
-
       #
       # Wait until the given block returns a true value.
       #
-      # @raise [Error::TimeOutError]
+      # @raise [Error::TimeoutError]
       # @return [Object] the result of the block
       #
 
-      def until(&blk)
-        end_time = Time.now + @timeout
+      def until
+        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
@@ -64,19 +62,22 @@ 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
+        raise Error::TimeoutError, msg
       end
 
+      private
+
+      def current_time
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
     end # Wait
   end # WebDriver
 end # Selenium
-

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
@@ -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,35 @@ module Selenium
       #
 
       def position
-        @bridge.getWindowPosition
+        @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
 
       #
@@ -94,7 +120,7 @@ module Selenium
       #
 
       def resize_to(width, height)
-        @bridge.setWindowSize Integer(width), Integer(height)
+        @bridge.resize_window Integer(width), Integer(height)
       end
 
       #
@@ -106,7 +132,7 @@ module Selenium
       #
 
       def move_to(x, y)
-        @bridge.setWindowPosition Integer(x), Integer(y)
+        @bridge.reposition_window Integer(x), Integer(y)
       end
 
       #
@@ -114,7 +140,15 @@ module Selenium
       #
 
       def maximize
-        @bridge.maximizeWindow
+        @bridge.maximize_window
+      end
+
+      #
+      # Minimize the current window
+      #
+
+      def minimize
+        @bridge.minimize_window
       end
 
       #
@@ -122,9 +156,8 @@ module Selenium
       #
 
       def full_screen
-        @bridge.fullscreenWindow
+        @bridge.full_screen_window
       end
-
     end # Window
   end # WebDriver
 end # Selenium

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
@@ -20,6 +20,7 @@
 require 'zip'
 require 'tempfile'
 require 'find'
+require 'base64'
 
 module Selenium
   module WebDriver
@@ -28,13 +29,11 @@ module Selenium
     #
 
     module Zipper
-
-      EXTENSIONS = %w[.zip .xpi]
+      EXTENSIONS = %w[.zip .xpi].freeze
 
       class << self
-
         def unzip(path)
-          destination = Dir.mktmpdir("webdriver-unzip")
+          destination = Dir.mktmpdir('webdriver-unzip')
           FileReaper << destination
 
           Zip::File.open(path) do |zip|
@@ -53,13 +52,11 @@ 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
-            File.open(zip.name, "rb") { |io| Base64.strict_encode64 io.read }
+            File.open(zip.name, 'rb') { |io| Base64.strict_encode64 io.read }
           end
         end
 
@@ -68,7 +65,7 @@ module Selenium
             add_zip_entry zip, path, File.basename(path)
 
             zip.commit
-            File.open(zip.name, "rb") { |io| Base64.strict_encode64 io.read }
+            File.open(zip.name, 'rb') { |io| Base64.strict_encode64 io.read }
           end
         end
 
@@ -78,7 +75,7 @@ module Selenium
           # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
           # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082
           tmp_dir = Dir.mktmpdir
-          zip_path = File.join(tmp_dir, "webdriver-zip")
+          zip_path = File.join(tmp_dir, 'webdriver-zip')
 
           begin
             Zip::File.open(zip_path, Zip::File::CREATE, &blk)
@@ -94,7 +91,6 @@ module Selenium
 
           zip.add entry, file
         end
-
       end
     end # Zipper
   end # WebDriver

data/lib/selenium/webdriver/common.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,14 +17,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'selenium/webdriver/common/core_ext/dir'
-require 'selenium/webdriver/common/core_ext/base64'
-require 'selenium/webdriver/common/w3c_error'
 require 'selenium/webdriver/common/error'
 require 'selenium/webdriver/common/platform'
 require 'selenium/webdriver/common/proxy'
 require 'selenium/webdriver/common/log_entry'
 require 'selenium/webdriver/common/file_reaper'
+require 'selenium/webdriver/common/service'
 require 'selenium/webdriver/common/socket_lock'
 require 'selenium/webdriver/common/socket_poller'
 require 'selenium/webdriver/common/port_prober'
@@ -38,26 +36,42 @@ require 'selenium/webdriver/common/target_locator'
 require 'selenium/webdriver/common/navigation'
 require 'selenium/webdriver/common/timeouts'
 require 'selenium/webdriver/common/window'
+require 'selenium/webdriver/common/logger'
 require 'selenium/webdriver/common/logs'
-require 'selenium/webdriver/common/options'
+require 'selenium/webdriver/common/manager'
+require 'selenium/webdriver/common/w3c_manager'
 require 'selenium/webdriver/common/search_context'
 require 'selenium/webdriver/common/action_builder'
+require 'selenium/webdriver/common/interactions/key_actions'
+require 'selenium/webdriver/common/interactions/pointer_actions'
+require 'selenium/webdriver/common/w3c_action_builder'
 require 'selenium/webdriver/common/touch_action_builder'
 require 'selenium/webdriver/common/html5/shared_web_storage'
 require 'selenium/webdriver/common/html5/local_storage'
 require 'selenium/webdriver/common/html5/session_storage'
 require 'selenium/webdriver/common/driver_extensions/takes_screenshot'
 require 'selenium/webdriver/common/driver_extensions/rotatable'
-require 'selenium/webdriver/common/driver_extensions/has_input_devices'
 require 'selenium/webdriver/common/driver_extensions/has_web_storage'
+require 'selenium/webdriver/common/driver_extensions/downloads_files'
 require 'selenium/webdriver/common/driver_extensions/has_location'
 require 'selenium/webdriver/common/driver_extensions/has_session_id'
 require 'selenium/webdriver/common/driver_extensions/has_touch_screen'
 require 'selenium/webdriver/common/driver_extensions/has_remote_status'
+require 'selenium/webdriver/common/driver_extensions/has_network_conditions'
 require 'selenium/webdriver/common/driver_extensions/has_network_connection'
+require 'selenium/webdriver/common/driver_extensions/has_permissions'
+require 'selenium/webdriver/common/driver_extensions/has_debugger'
 require 'selenium/webdriver/common/driver_extensions/uploads_files'
+require 'selenium/webdriver/common/driver_extensions/has_addons'
+require 'selenium/webdriver/common/interactions/interactions'
+require 'selenium/webdriver/common/interactions/input_device'
+require 'selenium/webdriver/common/interactions/interaction'
+require 'selenium/webdriver/common/interactions/none_input'
+require 'selenium/webdriver/common/interactions/key_input'
+require 'selenium/webdriver/common/interactions/pointer_input'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/bridge_helper'
 require 'selenium/webdriver/common/profile_helper'
+require 'selenium/webdriver/common/options'
 require 'selenium/webdriver/common/driver'
 require 'selenium/webdriver/common/element'

data/lib/selenium/webdriver/edge/bridge.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
@@ -20,83 +20,54 @@
 module Selenium
   module WebDriver
     module Edge
-
-      # @api private
-      class Bridge < Remote::W3CBridge
-
-        def initialize(opts = {})
-
-          http_client = opts.delete(:http_client)
-
-          if opts.has_key?(:url)
-            url = opts.delete(:url)
+      module Bridge
+
+        def commands(command)
+          unsupported = %i[execute_script execute_async_script submit_element double_click
+                           mouse_down mouse_up mouse_move_to click
+                           send_keys_to_active_element get_window_handles get_current_window_handle
+                           get_window_size set_window_size get_window_position set_window_position
+                           maximize_window get_alert_text accept_alert dismiss_alert]
+          if unsupported.include? command
+            Remote::OSS::Bridge::COMMANDS[command]
           else
-            @service = Service.default_service(*extract_service_args(opts))
-
-            if @service.instance_variable_get("@host") == "127.0.0.1"
-              @service.instance_variable_set("@host", 'localhost')
-            end
-
-            @service.start
-
-            url = @service.uri
+            super
           end
-
-          caps = create_capabilities(opts)
-
-          remote_opts = {
-            :url                  => url,
-            :desired_capabilities => caps
-          }
-
-          remote_opts.merge!(:http_client => http_client) if http_client
-          super(remote_opts)
         end
 
-        def browser
-          :edge
+        def send_keys_to_active_element(key)
+          execute :send_keys_to_active_element, {}, {value: key}
         end
 
-        def driver_extensions
-          [
-            DriverExtensions::TakesScreenshot,
-            DriverExtensions::HasInputDevices
-          ]
+        def window_handle
+          execute :get_current_window_handle
         end
 
-        def capabilities
-          @capabilities ||= Remote::Capabilities.edge
-        end
+        def window_size(handle = :current)
+          data = execute :get_window_size, window_handle: handle
 
-        def quit
-          super
-        ensure
-          @service.stop if @service
+          Dimension.new data['width'], data['height']
         end
 
-        private
-
-        def create_capabilities(opts)
-          caps               = opts.delete(:desired_capabilities) { Remote::W3CCapabilities.edge }
-          page_load_strategy = opts.delete(:page_load_strategy) || "normal"
-
-          unless opts.empty?
-            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
-          end
+        def resize_window(width, height, handle = :current)
+          execute :set_window_size, {window_handle: handle},
+                  {width: width,
+                   height: height}
+        end
 
-          caps['page_load_strategy'] = page_load_strategy
+        def window_position(handle = :current)
+          data = execute :get_window_position, window_handle: handle
 
-          caps
+          Point.new data['x'], data['y']
         end
 
-        def extract_service_args(opts)
-          args = []
-
-          if opts.has_key?(:service_log_path)
-            args << "--log-path=#{opts.delete(:service_log_path)}"
-          end
+        def reposition_window(x, y, handle = :current)
+          execute :set_window_position, {window_handle: handle},
+                  {x: x, y: y}
+        end
 
-          args
+        def maximize_window(handle = :current)
+          execute :maximize_window, window_handle: handle
         end
 
       end # Bridge

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

@@ -0,0 +1,66 @@
+# 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.
+
+module Selenium
+  module WebDriver
+    module Edge
+
+      #
+      # Driver implementation for Microsoft Edge.
+      # @api private
+      #
+
+      class Driver < WebDriver::Driver
+        include DriverExtensions::TakesScreenshot
+
+        def initialize(opts = {})
+          opts[:desired_capabilities] ||= Remote::Capabilities.edge
+
+          opts[:url] ||= service_url(opts)
+
+          listener = opts.delete(:listener)
+
+          # Edge is mostly using W3C dialect, but a request to
+          # create session responds with OSS-like body,
+          # so we need to force W3C implementation.
+          desired_capabilities = opts.delete(:desired_capabilities)
+          bridge = Remote::Bridge.new(opts)
+          capabilities = bridge.create_session(desired_capabilities)
+
+          WebDriver.logger.info 'Forcing W3C dialect.'
+          @bridge = Remote::W3C::Bridge.new(capabilities, bridge.session_id, **opts)
+          @bridge.extend Edge::Bridge
+
+          super(@bridge, listener: listener)
+        end
+
+        def browser
+          :edge
+        end
+
+        def quit
+          super
+        ensure
+          @service&.stop
+        end
+
+      end # Driver
+    end # Edge
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/edge/options.rb

@@ -0,0 +1,80 @@
+# 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.
+
+module Selenium
+  module WebDriver
+    module Edge
+      class Options
+        attr_accessor :in_private, :start_page
+        attr_reader :extension_paths
+
+        #
+        # Create a new Options instance for Edge.
+        #
+        # @example
+        #   options = Selenium::WebDriver::Edge::Options.new(in_private: true)
+        #   driver = Selenium::WebDriver.for :edge, options: options
+        #
+        # @param [Hash] opts the pre-defined options to create the Edge::Options with
+        # @option opts [Boolean] :in_private Start in private mode. Default is false
+        # @option opts [Array<String>] :extension_paths A list of full paths to extensions to install on startup
+        # @option opts [String] :start_page Default page to start with
+        #
+        # @see https://docs.microsoft.com/en-us/microsoft-edge/webdriver
+        #
+
+        def initialize(**opts)
+          @in_private = opts.delete(:in_private) || false
+          @extension_paths = opts.delete(:extension_paths) || []
+          @start_page = opts.delete(:start_page)
+        end
+
+        #
+        # Add an extension by local path.
+        #
+        # @example
+        #   options = Selenium::WebDriver::Edge::Options.new
+        #   options.add_extension_path('C:\path\to\extension')
+        #
+        # @param [String] path The local path to the extension folder
+        #
+
+        def add_extension_path(path)
+          raise Error::WebDriverError, "could not find extension at #{path.inspect}" unless File.directory?(path)
+
+          @extension_paths << path
+        end
+
+        #
+        # @api private
+        #
+
+        def as_json(*)
+          opts = {}
+
+          opts['ms:inPrivate'] = true if @in_private
+          opts['ms:extensionPaths'] = @extension_paths if @extension_paths.any?
+          opts['ms:startPage'] = @start_page if @start_page
+
+          opts
+        end
+      end # Options
+    end # Edge
+  end # WebDriver
+end # Selenium