selenium-webdriver 3.4.0 → 3.4.1

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

@@ -0,0 +1,266 @@
+# encoding: utf-8
+#
+# 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 Remote
+      def self.const_missing(const_name)
+        super unless const_name == :W3CCapabilities
+        WebDriver.logger.deprecate 'Selenium::WebDriver::Remote::W3CCapabilities', 'Selenium::WebDriver::Remote::Capabilities'
+        W3C::Capabilities
+      end
+
+      module W3C
+
+        #
+        # Specification of the desired and/or actual capabilities of the browser that the
+        # server is being asked to create.
+        #
+        # @api private
+        #
+
+        # TODO - uncomment when Mozilla fixes this:
+        # https://bugzilla.mozilla.org/show_bug.cgi?id=1326397
+        class Capabilities
+
+          # TODO (alex): compare with spec
+          KNOWN = [
+            :browser_name,
+            :browser_version,
+            :platform_name,
+            :platform_version,
+            :accept_insecure_certs,
+            :page_load_strategy,
+            :proxy,
+            :remote_session_id,
+            :accessibility_checks,
+            :device,
+            :implicit_timeout,
+            :page_load_timeout,
+            :script_timeout,
+          ].freeze
+
+          BROWSER_SPECIFIC = ['moz:firefoxOptions'].freeze
+
+          KNOWN.each do |key|
+            define_method key do
+              @capabilities.fetch(key)
+            end
+
+            define_method "#{key}=" do |value|
+              @capabilities[key] = value
+            end
+          end
+
+          #
+          # Backward compatibility
+          #
+
+          alias_method :version, :browser_version
+          alias_method :version=, :browser_version=
+          alias_method :platform, :platform_name
+          alias_method :platform=, :platform_name=
+
+          #
+          # Convenience methods for the common choices.
+          #
+
+          class << self
+            def edge(opts = {})
+              new({
+                browser_name: 'MicrosoftEdge',
+                platform: :windows
+              }.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)
+              opts[:timeouts] = {}
+              opts[:timeouts]['implicit'] = opts.delete(:implicit_timeout) if opts.key?(:implicit_timeout)
+              opts[:timeouts]['page load'] = opts.delete(:page_load_timeout) if opts.key?(:page_load_timeout)
+              opts[:timeouts]['script'] = opts.delete(:script_timeout) if opts.key?(:script_timeout)
+              new({browser_name: 'firefox', marionette: true}.merge(opts))
+            end
+
+            alias_method :ff, :firefox
+
+            #
+            # @api private
+            #
+
+            def json_create(data)
+              data = data.dup
+
+              caps = new
+              caps.browser_name = data.delete('browserName')
+              caps.browser_version = data.delete('browserVersion')
+              caps.platform_name = data.delete('platformName')
+              caps.platform_version = data.delete('platformVersion')
+              caps.accept_insecure_certs = data.delete('acceptInsecureCerts') if data.key?('acceptInsecureCerts')
+              caps.page_load_strategy = data.delete('pageLoadStrategy')
+              timeouts = data.delete('timeouts')
+              caps.implicit_timeout = timeouts['implicit'] if timeouts
+              caps.page_load_timeout = timeouts['pageLoad'] if timeouts
+              caps.script_timeout = timeouts['script'] if timeouts
+
+              proxy = data.delete('proxy')
+              caps.proxy = Proxy.json_create(proxy) unless proxy.nil? || proxy.empty?
+
+              # Remote Server Specific
+              caps[:remote_session_id] = data.delete('webdriver.remote.sessionid')
+
+              # Marionette Specific
+              caps[:accessibility_checks] = data.delete('moz:accessibilityChecks')
+              caps[:profile] = data.delete('moz:profile')
+              caps[:rotatable] = data.delete('rotatable')
+              caps[:device] = data.delete('device')
+
+              # any remaining pairs will be added as is, with no conversion
+              caps.merge!(data)
+
+              caps
+            end
+
+            #
+            # Creates W3C compliant capabilities from OSS ones.
+            # @param [Remote::Capabilities]
+            #
+
+            def from_oss(capabilities)
+              w3c_capabilties = new
+              # TODO (alex): make capabilities enumerable?
+              oss_capabilties = capabilities.__send__(:capabilities)
+              oss_capabilties.each do |name, value|
+                next if value.nil?
+                next if value.is_a?(String) && value.empty?
+
+                if w3c_capabilties.respond_to?("#{name}=")
+                  w3c_capabilties.__send__("#{name}=", value)
+                elsif BROWSER_SPECIFIC.include?(name)
+                  w3c_capabilties.merge!(name => value)
+                end
+
+              end
+
+              w3c_capabilties
+            end
+          end
+
+          #
+          # @param [Hash] opts
+          # @option :browser_name             [String] required browser name
+          # @option :browser_version          [String] required browser version number
+          # @option :platform_name            [Symbol] one of :any, :win, :mac, or :x
+          # @option :platform_version         [String] required platform version number
+          # @option :accept_insecure_certs    [Boolean] does the driver accept SSL Cerfifications?
+          # @option :proxy                    [Selenium::WebDriver::Proxy, Hash] proxy configuration
+          #
+          # @api public
+          #
+
+          def initialize(opts = {})
+            @capabilities = opts
+            self.proxy = opts.delete(:proxy)
+          end
+
+          #
+          # Allows setting arbitrary capabilities.
+          #
+
+          def []=(key, value)
+            @capabilities[key] = value
+          end
+
+          def [](key)
+            @capabilities[key]
+          end
+
+          def merge!(other)
+            if other.respond_to?(:capabilities, true) && other.capabilities.is_a?(Hash)
+              @capabilities.merge! other.capabilities
+            elsif other.is_a? Hash
+              @capabilities.merge! other
+            else
+              raise ArgumentError, 'argument should be a Hash or implement #capabilities'
+            end
+          end
+
+          def proxy=(proxy)
+            case proxy
+            when Hash
+              @capabilities[:proxy] = Proxy.new(proxy)
+            when Proxy, nil
+              @capabilities[:proxy] = proxy
+            else
+              raise TypeError, "expected Hash or #{Proxy.name}, got #{proxy.inspect}:#{proxy.class}"
+            end
+          end
+
+          #
+          # @api private
+          #
+
+          def as_json(*)
+            hash = {}
+
+            @capabilities.each do |key, value|
+              case key
+              when :platform
+                hash['platform'] = value.to_s.upcase
+              when :proxy
+                hash['proxy'] = value.as_json if value
+              when String, :firefox_binary
+                hash[key.to_s] = value
+              when Symbol
+                hash[camel_case(key.to_s)] = value
+              else
+                raise TypeError, "expected String or Symbol, got #{key.inspect}:#{key.class} / #{value.inspect}"
+              end
+            end
+
+            hash
+          end
+
+          def to_json(*)
+            JSON.generate as_json
+          end
+
+          def ==(other)
+            return false unless other.is_a? self.class
+            as_json == other.as_json
+          end
+
+          alias_method :eql?, :==
+
+          protected
+
+          attr_reader :capabilities
+
+          private
+
+          def camel_case(str)
+            str.gsub(/_([a-z])/) { Regexp.last_match(1).upcase }
+          end
+
+        end # Capabilities
+      end # W3c
+    end # Remote
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/remote/{w3c_commands.rb → w3c/commands.rb}

@@ -20,12 +20,15 @@
 module Selenium
   module WebDriver
     module Remote
-      class W3CBridge
+      module W3C
+
         #
         # http://www.w3.org/TR/2015/WD-webdriver-20150918/#list-of-endpoints
+        # @api private
         #
 
-        COMMANDS = {
+        class Bridge
+          COMMANDS = {
 
             #
             # session handling
@@ -138,8 +141,10 @@ module Selenium
 
             take_screenshot: [:get, 'session/:session_id/screenshot'.freeze],
             take_element_screenshot: [:get, 'session/:session_id/element/:id/screenshot'.freeze]
-        }.freeze
-      end
+          }.freeze
+
+        end # Bridge
+      end # W3C
     end # Remote
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/remote/w3c/driver.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+#
+# 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 Remote
+      module W3C
+
+        #
+        # Driver implementation for remote server talking W3C dialect.
+        # @api private
+        #
+
+        class Driver < WebDriver::Driver
+          include DriverExtensions::UploadsFiles
+          include DriverExtensions::TakesScreenshot
+          include DriverExtensions::HasSessionId
+          include DriverExtensions::Rotatable
+          include DriverExtensions::HasRemoteStatus
+          include DriverExtensions::HasWebStorage
+        end # Driver
+      end # W3C
+    end # Remote
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/safari.rb

@@ -17,8 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'websocket'
-require 'pathname'
+require 'selenium/webdriver/safari/driver'
+require 'selenium/webdriver/safari/service'
 
 module Selenium
   module WebDriver
@@ -40,7 +40,7 @@ module Selenium
         def path
           @path ||= '/Applications/Safari.app/Contents/MacOS/Safari'
           return @path if File.file?(@path) && File.executable?(@path)
-          raise Error::WebDriverError, 'Safari is only supported on Mac' unless Platform.os == :macosx
+          raise Error::WebDriverError, 'Safari is only supported on Mac' unless Platform.os.mac?
           raise Error::WebDriverError, 'Unable to find Safari'
         end
 
@@ -56,6 +56,3 @@ module Selenium
     end # Safari
   end # WebDriver
 end # Selenium
-
-require 'selenium/webdriver/safari/bridge'
-require 'selenium/webdriver/safari/service'

data/lib/selenium/webdriver/safari/{bridge.rb → driver.rb}

@@ -20,8 +20,15 @@
 module Selenium
   module WebDriver
     module Safari
+
+      #
+      # Driver implementation for Safari.
       # @api private
-      class Bridge < Remote::Bridge
+      #
+
+      class Driver < WebDriver::Driver
+        include DriverExtensions::TakesScreenshot
+
         def initialize(opts = {})
           opts[:desired_capabilities] ||= Remote::Capabilities.safari
 
@@ -31,9 +38,7 @@ module Selenium
 
             opts[:driver_opts] ||= {}
             if opts.key? :service_args
-              WebDriver.logger.warn <<-DEPRECATE.gsub(/\n +| {2,}/, ' ').freeze
-            [DEPRECATION] `:service_args` is deprecated. Pass switches using `driver_opts`
-              DEPRECATE
+              WebDriver.logger.deprecate ':service_args', "driver_opts: {args: #{opts[:service_args]}}"
               opts[:driver_opts][:args] = opts.delete(:service_args)
             end
 
@@ -42,7 +47,9 @@ module Selenium
             opts[:url] = @service.uri
           end
 
-          super(opts)
+          listener = opts.delete(:listener)
+          @bridge = Remote::Bridge.handshake(opts)
+          super(@bridge, listener: listener)
         end
 
         def quit
@@ -50,7 +57,8 @@ module Selenium
         ensure
           @service.stop if @service
         end
-      end # Bridge
+
+      end # Driver
     end # Safari
   end # WebDriver
 end # Selenium

data/selenium-webdriver.gemspec

@@ -5,7 +5,7 @@ raise "cwd must be #{root} when reading gemspec" if root != Dir.pwd
 
 Gem::Specification.new do |s|
   s.name = 'selenium-webdriver'
-  s.version = '3.4.0'
+  s.version = '3.4.1'
 
   s.authors = ['Alex Rodionov', 'Titus Fortner']
   s.email = ['p0deje@gmail.com', 'titusfortner@gmail.com']
@@ -24,11 +24,9 @@ HTML of the application.'
 
   s.add_runtime_dependency 'rubyzip', ['~> 1.0']
   s.add_runtime_dependency 'childprocess', ['~> 0.5']
-  s.add_runtime_dependency 'websocket', ['~> 1.0']
 
   s.add_development_dependency 'rspec', ['~> 3.0']
   s.add_development_dependency 'rack', ['~> 1.0']
-  s.add_development_dependency 'ci_reporter', ['~> 1.6', '>= 1.6.2']
   s.add_development_dependency 'webmock', ['~> 2.0']
   s.add_development_dependency 'yard', ['~> 0.8.7']
 end

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors: 
   - Alex Rodionov
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2017-04-21 00:00:00 -05:00
+date: 2017-06-13 00:00:00 +07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -36,75 +36,50 @@ dependencies:
             version: "0.5"
     type: :runtime
     version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: websocket
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "1.0"
-    type: :runtime
-    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "3.0"
     type: :development
-    version_requirements: *id004
+    version_requirements: *id003
   - !ruby/object:Gem::Dependency 
     name: rack
     prerelease: false
-    requirement: &id005 !ruby/object:Gem::Requirement 
+    requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "1.0"
     type: :development
-    version_requirements: *id005
-  - !ruby/object:Gem::Dependency 
-    name: ci_reporter
-    prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: "1.6"
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.6.2
-    type: :development
-    version_requirements: *id006
+    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: webmock
     prerelease: false
-    requirement: &id007 !ruby/object:Gem::Requirement 
+    requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.0"
     type: :development
-    version_requirements: *id007
+    version_requirements: *id005
   - !ruby/object:Gem::Dependency 
     name: yard
     prerelease: false
-    requirement: &id008 !ruby/object:Gem::Requirement 
+    requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 0.8.7
     type: :development
-    version_requirements: *id008
+    version_requirements: *id006
 description: |-
   WebDriver is a tool for writing automated tests of websites.
   It aims to mimic the behaviour of a real user, and as such interacts with the
@@ -121,6 +96,7 @@ extra_rdoc_files: []
 files: 
   - CHANGES
   - Gemfile
+  - Gemfile.lock
   - LICENSE
   - README.md
   - selenium-webdriver.gemspec
@@ -138,7 +114,8 @@ files:
   - lib/selenium/webdriver/safari.rb
   - lib/selenium/webdriver/support.rb
   - lib/selenium/webdriver/atoms/getAttribute.js
-  - lib/selenium/webdriver/chrome/bridge.rb
+  - lib/selenium/webdriver/chrome/driver.rb
+  - lib/selenium/webdriver/chrome/options.rb
   - lib/selenium/webdriver/chrome/profile.rb
   - lib/selenium/webdriver/chrome/service.rb
   - lib/selenium/webdriver/common/action_builder.rb
@@ -195,37 +172,44 @@ files:
   - lib/selenium/webdriver/common/interactions/pointer_actions.rb
   - lib/selenium/webdriver/common/interactions/pointer_input.rb
   - lib/selenium/webdriver/edge/bridge.rb
+  - lib/selenium/webdriver/edge/driver.rb
   - lib/selenium/webdriver/edge/service.rb
   - lib/selenium/webdriver/firefox/binary.rb
-  - lib/selenium/webdriver/firefox/bridge.rb
+  - lib/selenium/webdriver/firefox/driver.rb
   - lib/selenium/webdriver/firefox/extension.rb
   - lib/selenium/webdriver/firefox/launcher.rb
+  - lib/selenium/webdriver/firefox/options.rb
   - lib/selenium/webdriver/firefox/profile.rb
   - lib/selenium/webdriver/firefox/profiles_ini.rb
   - lib/selenium/webdriver/firefox/service.rb
   - lib/selenium/webdriver/firefox/util.rb
-  - lib/selenium/webdriver/firefox/w3c_bridge.rb
   - lib/selenium/webdriver/firefox/extension/prefs.json
   - lib/selenium/webdriver/firefox/extension/webdriver.xpi
+  - lib/selenium/webdriver/firefox/legacy/driver.rb
+  - lib/selenium/webdriver/firefox/marionette/driver.rb
   - lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so
   - lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so
-  - lib/selenium/webdriver/ie/bridge.rb
+  - lib/selenium/webdriver/ie/driver.rb
   - lib/selenium/webdriver/ie/service.rb
-  - lib/selenium/webdriver/phantomjs/bridge.rb
+  - lib/selenium/webdriver/phantomjs/driver.rb
   - lib/selenium/webdriver/phantomjs/service.rb
   - lib/selenium/webdriver/remote/bridge.rb
   - lib/selenium/webdriver/remote/capabilities.rb
-  - lib/selenium/webdriver/remote/commands.rb
+  - lib/selenium/webdriver/remote/driver.rb
   - lib/selenium/webdriver/remote/response.rb
   - lib/selenium/webdriver/remote/server_error.rb
-  - lib/selenium/webdriver/remote/w3c_bridge.rb
-  - lib/selenium/webdriver/remote/w3c_capabilities.rb
-  - lib/selenium/webdriver/remote/w3c_commands.rb
   - lib/selenium/webdriver/remote/http/common.rb
   - lib/selenium/webdriver/remote/http/curb.rb
   - lib/selenium/webdriver/remote/http/default.rb
   - lib/selenium/webdriver/remote/http/persistent.rb
-  - lib/selenium/webdriver/safari/bridge.rb
+  - lib/selenium/webdriver/remote/oss/bridge.rb
+  - lib/selenium/webdriver/remote/oss/commands.rb
+  - lib/selenium/webdriver/remote/oss/driver.rb
+  - lib/selenium/webdriver/remote/w3c/bridge.rb
+  - lib/selenium/webdriver/remote/w3c/capabilities.rb
+  - lib/selenium/webdriver/remote/w3c/commands.rb
+  - lib/selenium/webdriver/remote/w3c/driver.rb
+  - lib/selenium/webdriver/safari/driver.rb
   - lib/selenium/webdriver/safari/service.rb
   - lib/selenium/webdriver/support/abstract_event_listener.rb
   - lib/selenium/webdriver/support/block_event_listener.rb