selenium-webdriver 4.0.0.alpha2 → 4.0.0.alpha3

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

@@ -20,7 +20,7 @@
 module Selenium
   module WebDriver
     module IE
-      class Options
+      class Options < WebDriver::Options
         KEY = 'se:ieOptions'
         SCROLL_TOP = 0
         SCROLL_BOTTOM = 1
@@ -52,7 +52,7 @@ module Selenium
           end
         end
 
-        attr_reader :args, :options
+        attr_reader :args
 
         #
         # Create a new Options instance
@@ -85,9 +85,10 @@ module Selenium
         # @option opts [Boolean] validate_cookie_document_type
         #
 
-        def initialize(**opts)
-          @args = Set.new(opts.delete(:args) || [])
-          @options = opts
+        def initialize(args: nil, **opts)
+          super(opts)
+
+          @args = (args || []).to_set
           @options[:native_events] = true if @options[:native_events].nil?
         end
 
@@ -101,36 +102,15 @@ module Selenium
           @args << arg
         end
 
-        #
-        # Add a new option not yet handled by these bindings.
-        #
-        # @example
-        #   options = Selenium::WebDriver::IE::Options.new
-        #   options.add_option(:foo, 'bar')
-        #
-        # @param [String, Symbol] name Name of the option
-        # @param [Boolean, String, Integer] value Value of the option
-        #
-
-        def add_option(name, value)
-          @options[name] = value
-        end
-
         #
         # @api private
         #
 
         def as_json(*)
-          opts = {}
-
-          CAPABILITIES.each do |capability_alias, capability_name|
-            capability_value = @options.delete(capability_alias)
-            opts[capability_name] = capability_value unless capability_value.nil?
-          end
-          opts['ie.browserCommandLineSwitches'] = @args.to_a.join(' ') if @args.any?
-          opts.merge!(@options)
+          options = super
+          options['ie.browserCommandLineSwitches'] = @args.to_a.join(' ') if @args.any?
 
-          {KEY => opts}
+          {KEY => generate_as_json(options)}
         end
       end # Options
     end # IE

data/lib/selenium/webdriver/remote.rb

@@ -19,13 +19,19 @@
 
 require 'uri'
 
-require 'selenium/webdriver/remote/bridge'
-require 'selenium/webdriver/remote/driver'
-require 'selenium/webdriver/remote/response'
-require 'selenium/webdriver/remote/server_error'
-require 'selenium/webdriver/remote/http/common'
-require 'selenium/webdriver/remote/http/default'
-
-require 'selenium/webdriver/remote/bridge'
-require 'selenium/webdriver/remote/capabilities'
-require 'selenium/webdriver/remote/commands'
+module Selenium
+  module WebDriver
+    module Remote
+      autoload :Bridge, 'selenium/webdriver/remote/bridge'
+      autoload :Driver, 'selenium/webdriver/remote/driver'
+      autoload :Response, 'selenium/webdriver/remote/response'
+      autoload :ServerError, 'selenium/webdriver/remote/server_error'
+      autoload :Capabilities, 'selenium/webdriver/remote/capabilities'
+      autoload :COMMANDS, 'selenium/webdriver/remote/commands'
+      module Http
+        autoload :Common, 'selenium/webdriver/remote/http/common'
+        autoload :Default, 'selenium/webdriver/remote/http/default'
+      end
+    end
+  end
+end

data/lib/selenium/webdriver/remote/capabilities.rb

@@ -82,12 +82,22 @@ module Selenium
           end
 
           def edge(opts = {})
+            edge_html(opts)
+          end
+
+          def edge_html(opts = {})
             new({
               browser_name: 'MicrosoftEdge',
               platform_name: :windows
             }.merge(opts))
           end
 
+          def edge_chrome(opts = {})
+            new({
+              browser_name: 'MicrosoftEdge'
+            }.merge(opts))
+          end
+
           def firefox(opts = {})
             opts[:browser_version] = opts.delete(:version) if opts.key?(:version)
             opts[:platform_name] = opts.delete(:platform) if opts.key?(:platform)

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

@@ -59,10 +59,15 @@ module Selenium
               http.open_timeout = open_timeout
               http.read_timeout = read_timeout if read_timeout
 
-              http.start
+              start(http)
+              http
             end
           end
 
+          def start(http)
+            http.start
+          end
+
           MAX_RETRIES = 3
 
           def request(verb, url, headers, payload, redirects = 0)

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

@@ -31,6 +31,10 @@ module Selenium
 
           private
 
+          def start(*)
+            # no need to explicitly start connection
+          end
+
           def new_http_client
             proxy = nil
 
@@ -42,12 +46,7 @@ module Selenium
               proxy = URI.parse(url)
             end
 
-            if Net::HTTP::Persistent::VERSION >= '3'
-              Net::HTTP::Persistent.new name: 'webdriver', proxy: proxy
-            else
-              WebDriver.logger.warn 'Support for this version of net-http-persistent is deprecated. Please upgrade.'
-              Net::HTTP::Persistent.new 'webdriver', proxy
-            end
+            Net::HTTP::Persistent.new name: 'webdriver', proxy: proxy
           end
 
           def response_for(request)

data/lib/selenium/webdriver/safari.rb

@@ -17,13 +17,14 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'selenium/webdriver/safari/bridge'
-require 'selenium/webdriver/safari/driver'
-require 'selenium/webdriver/safari/options'
-
 module Selenium
   module WebDriver
     module Safari
+      autoload :Bridge, 'selenium/webdriver/safari/bridge'
+      autoload :Driver, 'selenium/webdriver/safari/driver'
+      autoload :Options, 'selenium/webdriver/safari/options'
+      autoload :Service, 'selenium/webdriver/safari/service'
+
       class << self
         def technology_preview
           "/Applications/Safari\ Technology\ Preview.app/Contents/MacOS/safaridriver"
@@ -61,5 +62,3 @@ module Selenium
     end # Safari
   end # WebDriver
 end # Selenium
-
-require 'selenium/webdriver/safari/service'

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

@@ -24,9 +24,9 @@ module Selenium
 
         # https://developer.apple.com/library/content/documentation/NetworkingInternetWeb/Conceptual/WebDriverEndpointDoc/Commands/Commands.html
         COMMANDS = {
-          get_permissions: [:get, '/session/:session_id/apple/permissions'],
-          set_permissions: [:post, '/session/:session_id/apple/permissions'],
-          attach_debugger: [:post, '/session/:session_id/apple/attach_debugger']
+          get_permissions: [:get, 'session/:session_id/apple/permissions'],
+          set_permissions: [:post, 'session/:session_id/apple/permissions'],
+          attach_debugger: [:post, 'session/:session_id/apple/attach_debugger']
         }.freeze
 
         def commands(command)

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

@@ -29,19 +29,21 @@ module Selenium
       class Driver < WebDriver::Driver
         include DriverExtensions::HasDebugger
         include DriverExtensions::HasPermissions
+        include DriverExtensions::HasWebStorage
         include DriverExtensions::TakesScreenshot
 
         def initialize(opts = {})
-          opts[:desired_capabilities] = create_capabilities(opts)
+          opts[:desired_capabilities] ||= Remote::Capabilities.safari
 
           opts[:url] ||= service_url(opts)
 
           listener = opts.delete(:listener)
           desired_capabilities = opts.delete(:desired_capabilities)
+          options = opts.delete(:options)
 
           @bridge = Remote::Bridge.new(opts)
           @bridge.extend Bridge
-          @bridge.create_session(desired_capabilities)
+          @bridge.create_session(desired_capabilities, options)
 
           super(@bridge, listener: listener)
         end
@@ -49,22 +51,6 @@ module Selenium
         def browser
           :safari
         end
-
-        def quit
-          super
-        ensure
-          @service&.stop
-        end
-
-        private
-
-        def create_capabilities(opts = {})
-          caps = opts.delete(:desired_capabilities) { Remote::Capabilities.safari }
-          options = opts.delete(:options) { Options.new }
-          caps.merge!(options.as_json)
-          caps
-        end
-
       end # Driver
     end # Safari
   end # WebDriver

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

@@ -20,8 +20,22 @@
 module Selenium
   module WebDriver
     module Safari
-      class Options
-        attr_accessor :automatic_inspection, :automatic_profiling
+      class Options < WebDriver::Options
+        attr_accessor :options
+
+        # @see https://developer.apple.com/documentation/webkit/about_webdriver_for_safari
+        CAPABILITIES = {automatic_inspection: 'safari:automaticInspection',
+                        automatic_profiling: 'safari:automaticProfiling'}.freeze
+
+        CAPABILITIES.each_key do |key|
+          define_method key do
+            @options[key]
+          end
+
+          define_method "#{key}=" do |value|
+            @options[key] = value
+          end
+        end
 
         #
         # Create a new Options instance for W3C-capable versions of Safari.
@@ -34,12 +48,9 @@ module Selenium
         # @option opts [Boolean] :automatic_inspection Preloads Web Inspector and JavaScript debugger. Default is false
         # @option opts [Boolean] :automatic_profiling Preloads Web Inspector and starts a timeline recording. Default is false
         #
-        # @see https://developer.apple.com/documentation/webkit/about_webdriver_for_safari
-        #
 
         def initialize(**opts)
-          @automatic_inspection = opts.delete(:automatic_inspection) || false
-          @automatic_profiling = opts.delete(:automatic_profiling) || false
+          super
         end
 
         #
@@ -47,12 +58,7 @@ module Selenium
         #
 
         def as_json(*)
-          opts = {}
-
-          opts['safari:automaticInspection'] = true if @automatic_inspection
-          opts['safari:automaticProfiling'] = true if @automatic_profiling
-
-          opts
+          generate_as_json(super)
         end
       end # Options
     end # Safari

data/lib/selenium/webdriver/version.rb

@@ -19,6 +19,6 @@
 
 module Selenium
   module WebDriver
-    VERSION = '4.0.0.alpha2'
+    VERSION = '4.0.0.alpha3'
   end # WebDriver
 end # Selenium

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha2
+  version: 4.0.0.alpha3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +242,7 @@ files:
 - lib/selenium/webdriver/common/logs.rb
 - lib/selenium/webdriver/common/manager.rb
 - lib/selenium/webdriver/common/navigation.rb
+- lib/selenium/webdriver/common/options.rb
 - lib/selenium/webdriver/common/platform.rb
 - lib/selenium/webdriver/common/port_prober.rb
 - lib/selenium/webdriver/common/profile_helper.rb
@@ -256,9 +257,14 @@ files:
 - lib/selenium/webdriver/common/window.rb
 - lib/selenium/webdriver/common/zipper.rb
 - lib/selenium/webdriver/edge.rb
-- lib/selenium/webdriver/edge/driver.rb
-- lib/selenium/webdriver/edge/options.rb
-- lib/selenium/webdriver/edge/service.rb
+- lib/selenium/webdriver/edge_chrome/bridge.rb
+- lib/selenium/webdriver/edge_chrome/driver.rb
+- lib/selenium/webdriver/edge_chrome/options.rb
+- lib/selenium/webdriver/edge_chrome/profile.rb
+- lib/selenium/webdriver/edge_chrome/service.rb
+- lib/selenium/webdriver/edge_html/driver.rb
+- lib/selenium/webdriver/edge_html/options.rb
+- lib/selenium/webdriver/edge_html/service.rb
 - lib/selenium/webdriver/firefox.rb
 - lib/selenium/webdriver/firefox/binary.rb
 - lib/selenium/webdriver/firefox/bridge.rb