selenium-webdriver 3.141.0 → 3.141.592

data/lib/selenium/webdriver/remote/http/default.rb

@@ -1,3 +1,5 @@
+# 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
@@ -48,22 +50,26 @@ module Selenium
             self.read_timeout = value
           end
 
+          def close
+            @http&.finish
+          end
+
           private
 
           def http
-            @http ||= (
-            http = new_http_client
-            if server_url.scheme == 'https'
-              http.use_ssl = true
-              http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-            end
+            @http ||= begin
+              http = new_http_client
+              if server_url.scheme == 'https'
+                http.use_ssl = true
+                http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+              end
 
-            # Defaulting open_timeout to nil to be consistent with Ruby 2.2 and earlier.
-            http.open_timeout = self.open_timeout
-            http.read_timeout = self.read_timeout if self.read_timeout
+              # Defaulting open_timeout to nil to be consistent with Ruby 2.2 and earlier.
+              http.open_timeout = open_timeout
+              http.read_timeout = read_timeout if read_timeout
 
-            http
-            )
+              http.start
+            end
           end
 
           MAX_RETRIES = 3
@@ -83,22 +89,26 @@ module Selenium
               #
               # http://msdn.microsoft.com/en-us/library/aa560610%28v=bts.20%29.aspx
               raise if retries >= MAX_RETRIES
+
               retries += 1
               sleep 2
               retry
             rescue Errno::EADDRNOTAVAIL => ex
               # a retry is sometimes needed when the port becomes temporarily unavailable
               raise if retries >= MAX_RETRIES
+
               retries += 1
               sleep 2
               retry
             rescue Errno::ECONNREFUSED => ex
               raise ex.class, "using proxy: #{proxy.http}" if use_proxy?
+
               raise
             end
 
             if response.is_a? Net::HTTPRedirection
               raise Error::WebDriverError, 'too many redirects' if redirects >= MAX_REDIRECTS
+
               request(:get, URI.parse(response['Location']), DEFAULT_HEADERS.dup, nil, redirects + 1)
             else
               create_response response.code, response.body, response.content_type
@@ -108,9 +118,7 @@ module Selenium
           def new_request_for(verb, url, headers, payload)
             req = Net::HTTP.const_get(verb.to_s.capitalize).new(url.path, headers)
 
-            if server_url.userinfo
-              req.basic_auth server_url.user, server_url.password
-            end
+            req.basic_auth server_url.user, server_url.password if server_url.userinfo
 
             req.body = payload if payload
 
@@ -124,9 +132,7 @@ module Selenium
           def new_http_client
             if use_proxy?
               url = @proxy.http
-              unless proxy.respond_to?(:http) && url
-                raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}"
-              end
+              raise Error::WebDriverError, "expected HTTP proxy, got #{@proxy.inspect}" unless proxy.respond_to?(:http) && url
 
               proxy = URI.parse(url)
 
@@ -138,15 +144,15 @@ module Selenium
           end
 
           def proxy
-            @proxy ||= (
-            proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-            no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
+            @proxy ||= begin
+              proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
+              no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
 
-            if proxy
-              proxy = "http://#{proxy}" unless proxy.start_with?('http://')
-              Proxy.new(http: proxy, no_proxy: no_proxy)
+              if proxy
+                proxy = "http://#{proxy}" unless proxy.start_with?('http://')
+                Proxy.new(http: proxy, no_proxy: no_proxy)
+              end
             end
-            )
           end
 
           def use_proxy?
@@ -161,7 +167,7 @@ module Selenium
                 rescue ArgumentError
                   false
                 end
-                  )
+              )
               end
 
               !ignored

data/lib/selenium/webdriver/remote/http/persistent.rb

@@ -1,3 +1,5 @@
+# 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
@@ -24,7 +26,7 @@ module Selenium
         # @api private
         class Persistent < Default
           def close
-            @http.shutdown if @http
+            @http&.shutdown
           end
 
           private

data/lib/selenium/webdriver/remote/oss/bridge.rb

@@ -1,3 +1,5 @@
+# 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
@@ -279,8 +281,8 @@ module Selenium
           # cookies
           #
 
-          def options
-            @options ||= WebDriver::Options.new(self)
+          def manage
+            @manage ||= WebDriver::Manager.new(self)
           end
 
           def add_cookie(cookie)
@@ -571,6 +573,7 @@ module Selenium
 
           def assert_javascript_enabled
             return if capabilities.javascript_enabled?
+
             raise Error::UnsupportedOperationError, 'underlying webdriver instance does not support javascript'
           end
 

data/lib/selenium/webdriver/remote/oss/commands.rb

@@ -1,3 +1,5 @@
+# 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
@@ -28,190 +30,190 @@ module Selenium
         class Bridge
 
           COMMANDS = {
-            get_capabilities: [:get, 'session/:session_id'.freeze],
-            status: [:get, 'status'.freeze],
+            get_capabilities: [:get, 'session/:session_id'],
+            status: [:get, 'status'],
 
             #
             # basic driver
             #
 
-            get_current_url: [:get, 'session/:session_id/url'.freeze],
-            get: [:post, 'session/:session_id/url'.freeze],
-            go_forward: [:post, 'session/:session_id/forward'.freeze],
-            go_back: [:post, 'session/:session_id/back'.freeze],
-            refresh: [:post, 'session/:session_id/refresh'.freeze],
-            quit: [:delete, 'session/:session_id'.freeze],
-            close: [:delete, 'session/:session_id/window'.freeze],
-            get_page_source: [:get, 'session/:session_id/source'.freeze],
-            get_title: [:get, 'session/:session_id/title'.freeze],
-            find_element: [:post, 'session/:session_id/element'.freeze],
-            find_elements: [:post, 'session/:session_id/elements'.freeze],
-            get_active_element: [:post, 'session/:session_id/element/active'.freeze],
+            get_current_url: [:get, 'session/:session_id/url'],
+            get: [:post, 'session/:session_id/url'],
+            go_forward: [:post, 'session/:session_id/forward'],
+            go_back: [:post, 'session/:session_id/back'],
+            refresh: [:post, 'session/:session_id/refresh'],
+            quit: [:delete, 'session/:session_id'],
+            close: [:delete, 'session/:session_id/window'],
+            get_page_source: [:get, 'session/:session_id/source'],
+            get_title: [:get, 'session/:session_id/title'],
+            find_element: [:post, 'session/:session_id/element'],
+            find_elements: [:post, 'session/:session_id/elements'],
+            get_active_element: [:post, 'session/:session_id/element/active'],
 
             #
             # window handling
             #
 
-            get_current_window_handle: [:get, 'session/:session_id/window_handle'.freeze],
-            get_window_handles: [:get, 'session/:session_id/window_handles'.freeze],
-            set_window_size: [:post, 'session/:session_id/window/:window_handle/size'.freeze],
-            set_window_position: [:post, 'session/:session_id/window/:window_handle/position'.freeze],
-            get_window_size: [:get, 'session/:session_id/window/:window_handle/size'.freeze],
-            get_window_position: [:get, 'session/:session_id/window/:window_handle/position'.freeze],
-            maximize_window: [:post, 'session/:session_id/window/:window_handle/maximize'.freeze],
+            get_current_window_handle: [:get, 'session/:session_id/window_handle'],
+            get_window_handles: [:get, 'session/:session_id/window_handles'],
+            set_window_size: [:post, 'session/:session_id/window/:window_handle/size'],
+            set_window_position: [:post, 'session/:session_id/window/:window_handle/position'],
+            get_window_size: [:get, 'session/:session_id/window/:window_handle/size'],
+            get_window_position: [:get, 'session/:session_id/window/:window_handle/position'],
+            maximize_window: [:post, 'session/:session_id/window/:window_handle/maximize'],
 
             #
             # script execution
             #
 
-            execute_script: [:post, 'session/:session_id/execute'.freeze],
-            execute_async_script: [:post, 'session/:session_id/execute_async'.freeze],
+            execute_script: [:post, 'session/:session_id/execute'],
+            execute_async_script: [:post, 'session/:session_id/execute_async'],
 
             #
             # screenshot
             #
 
-            screenshot: [:get, 'session/:session_id/screenshot'.freeze],
+            screenshot: [:get, 'session/:session_id/screenshot'],
 
             #
             # alerts
             #
 
-            dismiss_alert: [:post, 'session/:session_id/dismiss_alert'.freeze],
-            accept_alert: [:post, 'session/:session_id/accept_alert'.freeze],
-            get_alert_text: [:get, 'session/:session_id/alert_text'.freeze],
-            set_alert_value: [:post, 'session/:session_id/alert_text'.freeze],
-            set_authentication: [:post, 'session/:session_id/alert/credentials'.freeze],
+            dismiss_alert: [:post, 'session/:session_id/dismiss_alert'],
+            accept_alert: [:post, 'session/:session_id/accept_alert'],
+            get_alert_text: [:get, 'session/:session_id/alert_text'],
+            set_alert_value: [:post, 'session/:session_id/alert_text'],
+            set_authentication: [:post, 'session/:session_id/alert/credentials'],
 
             #
             # target locator
             #
 
-            switch_to_frame: [:post, 'session/:session_id/frame'.freeze],
-            switch_to_parent_frame: [:post, 'session/:session_id/frame/parent'.freeze],
-            switch_to_window: [:post, 'session/:session_id/window'.freeze],
+            switch_to_frame: [:post, 'session/:session_id/frame'],
+            switch_to_parent_frame: [:post, 'session/:session_id/frame/parent'],
+            switch_to_window: [:post, 'session/:session_id/window'],
 
             #
             # options
             #
 
-            get_cookies: [:get, 'session/:session_id/cookie'.freeze],
-            add_cookie: [:post, 'session/:session_id/cookie'.freeze],
-            delete_all_cookies: [:delete, 'session/:session_id/cookie'.freeze],
-            delete_cookie: [:delete, 'session/:session_id/cookie/:name'.freeze],
+            get_cookies: [:get, 'session/:session_id/cookie'],
+            add_cookie: [:post, 'session/:session_id/cookie'],
+            delete_all_cookies: [:delete, 'session/:session_id/cookie'],
+            delete_cookie: [:delete, 'session/:session_id/cookie/:name'],
 
             #
             # timeouts
             #
 
-            implicitly_wait: [:post, 'session/:session_id/timeouts/implicit_wait'.freeze],
-            set_script_timeout: [:post, 'session/:session_id/timeouts/async_script'.freeze],
-            set_timeout: [:post, 'session/:session_id/timeouts'.freeze],
+            implicitly_wait: [:post, 'session/:session_id/timeouts/implicit_wait'],
+            set_script_timeout: [:post, 'session/:session_id/timeouts/async_script'],
+            set_timeout: [:post, 'session/:session_id/timeouts'],
 
             #
             # element
             #
 
-            describe_element: [:get, 'session/:session_id/element/:id'.freeze],
-            find_child_element: [:post, 'session/:session_id/element/:id/element'.freeze],
-            find_child_elements: [:post, 'session/:session_id/element/:id/elements'.freeze],
-            click_element: [:post, 'session/:session_id/element/:id/click'.freeze],
-            submit_element: [:post, 'session/:session_id/element/:id/submit'.freeze],
-            get_element_value: [:get, 'session/:session_id/element/:id/value'.freeze],
-            send_keys_to_element: [:post, 'session/:session_id/element/:id/value'.freeze],
-            upload_file: [:post, 'session/:session_id/file'.freeze],
-            get_element_tag_name: [:get, 'session/:session_id/element/:id/name'.freeze],
-            clear_element: [:post, 'session/:session_id/element/:id/clear'.freeze],
-            is_element_selected: [:get, 'session/:session_id/element/:id/selected'.freeze],
-            is_element_enabled: [:get, 'session/:session_id/element/:id/enabled'.freeze],
-            get_element_attribute: [:get, 'session/:session_id/element/:id/attribute/:name'.freeze],
-            element_equals: [:get, 'session/:session_id/element/:id/equals/:other'.freeze],
-            is_element_displayed: [:get, 'session/:session_id/element/:id/displayed'.freeze],
-            get_element_location: [:get, 'session/:session_id/element/:id/location'.freeze],
-            get_element_location_once_scrolled_into_view: [:get, 'session/:session_id/element/:id/location_in_view'.freeze],
-            get_element_size: [:get, 'session/:session_id/element/:id/size'.freeze],
-            drag_element: [:post, 'session/:session_id/element/:id/drag'.freeze],
-            get_element_value_of_css_property: [:get, 'session/:session_id/element/:id/css/:property_name'.freeze],
-            get_element_text: [:get, 'session/:session_id/element/:id/text'.freeze],
+            describe_element: [:get, 'session/:session_id/element/:id'],
+            find_child_element: [:post, 'session/:session_id/element/:id/element'],
+            find_child_elements: [:post, 'session/:session_id/element/:id/elements'],
+            click_element: [:post, 'session/:session_id/element/:id/click'],
+            submit_element: [:post, 'session/:session_id/element/:id/submit'],
+            get_element_value: [:get, 'session/:session_id/element/:id/value'],
+            send_keys_to_element: [:post, 'session/:session_id/element/:id/value'],
+            upload_file: [:post, 'session/:session_id/file'],
+            get_element_tag_name: [:get, 'session/:session_id/element/:id/name'],
+            clear_element: [:post, 'session/:session_id/element/:id/clear'],
+            is_element_selected: [:get, 'session/:session_id/element/:id/selected'],
+            is_element_enabled: [:get, 'session/:session_id/element/:id/enabled'],
+            get_element_attribute: [:get, 'session/:session_id/element/:id/attribute/:name'],
+            element_equals: [:get, 'session/:session_id/element/:id/equals/:other'],
+            is_element_displayed: [:get, 'session/:session_id/element/:id/displayed'],
+            get_element_location: [:get, 'session/:session_id/element/:id/location'],
+            get_element_location_once_scrolled_into_view: [:get, 'session/:session_id/element/:id/location_in_view'],
+            get_element_size: [:get, 'session/:session_id/element/:id/size'],
+            drag_element: [:post, 'session/:session_id/element/:id/drag'],
+            get_element_value_of_css_property: [:get, 'session/:session_id/element/:id/css/:property_name'],
+            get_element_text: [:get, 'session/:session_id/element/:id/text'],
 
             #
             # rotatable
             #
 
-            get_screen_orientation: [:get, 'session/:session_id/orientation'.freeze],
-            set_screen_orientation: [:post, 'session/:session_id/orientation'.freeze],
+            get_screen_orientation: [:get, 'session/:session_id/orientation'],
+            set_screen_orientation: [:post, 'session/:session_id/orientation'],
 
             #
             # interactions API
             #
 
-            click: [:post, 'session/:session_id/click'.freeze],
-            double_click: [:post, 'session/:session_id/doubleclick'.freeze],
-            mouse_down: [:post, 'session/:session_id/buttondown'.freeze],
-            mouse_up: [:post, 'session/:session_id/buttonup'.freeze],
-            mouse_move_to: [:post, 'session/:session_id/moveto'.freeze],
-            send_modifier_key_to_active_element: [:post, 'session/:session_id/modifier'.freeze],
-            send_keys_to_active_element: [:post, 'session/:session_id/keys'.freeze],
+            click: [:post, 'session/:session_id/click'],
+            double_click: [:post, 'session/:session_id/doubleclick'],
+            mouse_down: [:post, 'session/:session_id/buttondown'],
+            mouse_up: [:post, 'session/:session_id/buttonup'],
+            mouse_move_to: [:post, 'session/:session_id/moveto'],
+            send_modifier_key_to_active_element: [:post, 'session/:session_id/modifier'],
+            send_keys_to_active_element: [:post, 'session/:session_id/keys'],
 
             #
             # html 5
             #
 
-            execute_sql: [:post, 'session/:session_id/execute_sql'.freeze],
+            execute_sql: [:post, 'session/:session_id/execute_sql'],
 
-            get_location: [:get, 'session/:session_id/location'.freeze],
-            set_location: [:post, 'session/:session_id/location'.freeze],
+            get_location: [:get, 'session/:session_id/location'],
+            set_location: [:post, 'session/:session_id/location'],
 
-            get_app_cache: [:get, 'session/:session_id/application_cache'.freeze],
-            get_app_cache_status: [:get, 'session/:session_id/application_cache/status'.freeze],
-            clear_app_cache: [:delete, 'session/:session_id/application_cache/clear'.freeze],
+            get_app_cache: [:get, 'session/:session_id/application_cache'],
+            get_app_cache_status: [:get, 'session/:session_id/application_cache/status'],
+            clear_app_cache: [:delete, 'session/:session_id/application_cache/clear'],
 
-            get_network_connection: [:get, 'session/:session_id/network_connection'.freeze],
-            set_network_connection: [:post, 'session/:session_id/network_connection'.freeze],
+            get_network_connection: [:get, 'session/:session_id/network_connection'],
+            set_network_connection: [:post, 'session/:session_id/network_connection'],
 
-            get_local_storage_item: [:get, 'session/:session_id/local_storage/key/:key'.freeze],
-            remove_local_storage_item: [:delete, 'session/:session_id/local_storage/key/:key'.freeze],
-            get_local_storage_keys: [:get, 'session/:session_id/local_storage'.freeze],
-            set_local_storage_item: [:post, 'session/:session_id/local_storage'.freeze],
-            clear_local_storage: [:delete, 'session/:session_id/local_storage'.freeze],
-            get_local_storage_size: [:get, 'session/:session_id/local_storage/size'.freeze],
+            get_local_storage_item: [:get, 'session/:session_id/local_storage/key/:key'],
+            remove_local_storage_item: [:delete, 'session/:session_id/local_storage/key/:key'],
+            get_local_storage_keys: [:get, 'session/:session_id/local_storage'],
+            set_local_storage_item: [:post, 'session/:session_id/local_storage'],
+            clear_local_storage: [:delete, 'session/:session_id/local_storage'],
+            get_local_storage_size: [:get, 'session/:session_id/local_storage/size'],
 
-            get_session_storage_item: [:get, 'session/:session_id/session_storage/key/:key'.freeze],
-            remove_session_storage_item: [:delete, 'session/:session_id/session_storage/key/:key'.freeze],
-            get_session_storage_keys: [:get, 'session/:session_id/session_storage'.freeze],
-            set_session_storage_item: [:post, 'session/:session_id/session_storage'.freeze],
-            clear_session_storage: [:delete, 'session/:session_id/session_storage'.freeze],
-            get_session_storage_size: [:get, 'session/:session_id/session_storage/size'.freeze],
+            get_session_storage_item: [:get, 'session/:session_id/session_storage/key/:key'],
+            remove_session_storage_item: [:delete, 'session/:session_id/session_storage/key/:key'],
+            get_session_storage_keys: [:get, 'session/:session_id/session_storage'],
+            set_session_storage_item: [:post, 'session/:session_id/session_storage'],
+            clear_session_storage: [:delete, 'session/:session_id/session_storage'],
+            get_session_storage_size: [:get, 'session/:session_id/session_storage/size'],
 
             #
             # ime
             #
 
-            ime_get_available_engines: [:get, 'session/:session_id/ime/available_engines'.freeze],
-            ime_get_active_engine: [:get, 'session/:session_id/ime/active_engine'.freeze],
-            ime_is_activated: [:get, 'session/:session_id/ime/activated'.freeze],
-            ime_deactivate: [:post, 'session/:session_id/ime/deactivate'.freeze],
-            ime_activate_engine: [:post, 'session/:session_id/ime/activate'.freeze],
+            ime_get_available_engines: [:get, 'session/:session_id/ime/available_engines'],
+            ime_get_active_engine: [:get, 'session/:session_id/ime/active_engine'],
+            ime_is_activated: [:get, 'session/:session_id/ime/activated'],
+            ime_deactivate: [:post, 'session/:session_id/ime/deactivate'],
+            ime_activate_engine: [:post, 'session/:session_id/ime/activate'],
 
             #
             # touch
             #
 
-            touch_single_tap: [:post, 'session/:session_id/touch/click'.freeze],
-            touch_double_tap: [:post, 'session/:session_id/touch/doubleclick'.freeze],
-            touch_long_press: [:post, 'session/:session_id/touch/longclick'.freeze],
-            touch_down: [:post, 'session/:session_id/touch/down'.freeze],
-            touch_up: [:post, 'session/:session_id/touch/up'.freeze],
-            touch_move: [:post, 'session/:session_id/touch/move'.freeze],
-            touch_scroll: [:post, 'session/:session_id/touch/scroll'.freeze],
-            touch_flick: [:post, 'session/:session_id/touch/flick'.freeze],
+            touch_single_tap: [:post, 'session/:session_id/touch/click'],
+            touch_double_tap: [:post, 'session/:session_id/touch/doubleclick'],
+            touch_long_press: [:post, 'session/:session_id/touch/longclick'],
+            touch_down: [:post, 'session/:session_id/touch/down'],
+            touch_up: [:post, 'session/:session_id/touch/up'],
+            touch_move: [:post, 'session/:session_id/touch/move'],
+            touch_scroll: [:post, 'session/:session_id/touch/scroll'],
+            touch_flick: [:post, 'session/:session_id/touch/flick'],
 
             #
             # logs
             #
 
-            get_available_log_types: [:get, 'session/:session_id/log/types'.freeze],
-            get_log: [:post, 'session/:session_id/log'.freeze]
+            get_available_log_types: [:get, 'session/:session_id/log/types'],
+            get_log: [:post, 'session/:session_id/log']
           }.freeze
 
         end # Bridge