selenium-webdriver 2.53.4 → 3.8.0

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

@@ -1,5 +1,3 @@
-# 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
@@ -25,19 +23,18 @@ module Selenium
       # server is being asked to create.
       #
       class Capabilities
-
         DEFAULTS = {
-          :browser_name          => "",
-          :version               => "",
-          :platform              => :any,
-          :javascript_enabled    => false,
-          :css_selectors_enabled => false,
-          :takes_screenshot      => false,
-          :native_events         => false,
-          :rotatable             => false,
-          :firefox_profile       => nil,
-          :proxy                 => nil
-        }
+          browser_name: '',
+          version: '',
+          platform: :any,
+          javascript_enabled: false,
+          css_selectors_enabled: false,
+          takes_screenshot: false,
+          native_events: false,
+          rotatable: false,
+          firefox_profile: nil,
+          proxy: nil
+        }.freeze
 
         DEFAULTS.each_key do |key|
           define_method key do
@@ -49,108 +46,94 @@ module Selenium
           end
         end
 
+        #
+        # Returns javascript_enabled capability.
+        # It is true if not set explicitly.
+        #
+        def javascript_enabled
+          javascript_enabled = @capabilities.fetch(:javascript_enabled)
+          javascript_enabled.nil? ? true : javascript_enabled
+        end
+
         alias_method :css_selectors_enabled?, :css_selectors_enabled
-        alias_method :javascript_enabled?   , :javascript_enabled
-        alias_method :native_events?        , :native_events
-        alias_method :takes_screenshot?     , :takes_screenshot
-        alias_method :rotatable?            , :rotatable
+        alias_method :javascript_enabled?, :javascript_enabled
+        alias_method :native_events?, :native_events
+        alias_method :takes_screenshot?, :takes_screenshot
+        alias_method :rotatable?, :rotatable
 
         #
         # Convenience methods for the common choices.
         #
 
         class << self
-          def android(opts = {})
-            new({
-              :browser_name       => "android",
-              :platform           => :android,
-              :javascript_enabled => true,
-              :rotatable          => true,
-              :takes_screenshot   => true
-            }.merge(opts))
-          end
-
           def chrome(opts = {})
             new({
-              :browser_name          => "chrome",
-              :javascript_enabled    => true,
-              :css_selectors_enabled => true,
-              :loggingPrefs => {:browser => "ALL",
-                                :driver => "ALL"}
-                }.merge(opts))
+              browser_name: 'chrome',
+              javascript_enabled: true,
+              css_selectors_enabled: true
+            }.merge(opts))
           end
 
           def edge(opts = {})
-            W3CCapabilities.edge(opts)
+            new({
+              browser_name: 'MicrosoftEdge',
+              platform: :windows,
+              javascript_enabled: true,
+              takes_screenshot: true,
+              css_selectors_enabled: true
+            }.merge(opts))
           end
 
           def firefox(opts = {})
-            return W3CCapabilities.firefox(opts) if opts[:marionette]
-
             new({
-              :browser_name          => "firefox",
-              :javascript_enabled    => true,
-              :takes_screenshot      => true,
-              :css_selectors_enabled => true
+              browser_name: 'firefox',
+              javascript_enabled: true,
+              takes_screenshot: true,
+              css_selectors_enabled: true
             }.merge(opts))
           end
 
           def htmlunit(opts = {})
             new({
-              :browser_name => "htmlunit"
+              browser_name: 'htmlunit'
             }.merge(opts))
           end
 
           def htmlunitwithjs(opts = {})
             new({
-              :browser_name => "htmlunit",
-              :javascript_enabled => true
+              browser_name: 'htmlunit',
+              javascript_enabled: true
             }.merge(opts))
           end
 
           def internet_explorer(opts = {})
             new({
-              :browser_name          => "internet explorer",
-              :platform              => :windows,
-              :takes_screenshot      => true,
-              :css_selectors_enabled => true,
-              :native_events         => true
+              browser_name: 'internet explorer',
+              platform: :windows,
+              takes_screenshot: true,
+              css_selectors_enabled: true,
+              native_events: true
             }.merge(opts))
           end
           alias_method :ie, :internet_explorer
 
-          def iphone(opts = {})
-            new({
-              :browser_name       => "iPhone",
-              :platform           => :mac,
-              :javascript_enabled => true
-            }.merge(opts))
-          end
-
-          def ipad(opts = {})
-            new({
-              :browser_name       => "iPad",
-              :platform           => :mac,
-              :javascript_enabled => true
-            }.merge(opts))
-          end
-
           def phantomjs(opts = {})
+            WebDriver.logger.deprecate 'Selenium support for PhantomJS', 'headless Chrome/Firefox or HTMLUnit'
             new({
-              :browser_name          => "phantomjs",
-              :javascript_enabled    => true,
-              :takes_screenshot      => true,
-              :css_selectors_enabled => true
+              browser_name: 'phantomjs',
+              javascript_enabled: true,
+              takes_screenshot: true,
+              css_selectors_enabled: true
             }.merge(opts))
           end
 
           def safari(opts = {})
             new({
-              :browser_name          => "safari",
-              :platform              => :mac,
-              :javascript_enabled    => true,
-              :takes_screenshot      => true,
-              :css_selectors_enabled => true
+              browser_name: 'safari',
+              platform: :mac,
+              javascript_enabled: true,
+              takes_screenshot: true,
+              css_selectors_enabled: true
             }.merge(opts))
           end
 
@@ -162,15 +145,15 @@ module Selenium
             data = data.dup
 
             caps = new
-            caps.browser_name          = data.delete("browserName")
-            caps.version               = data.delete("version")
-            caps.platform              = data.delete("platform").downcase.to_sym if data.has_key?('platform')
-            caps.javascript_enabled    = data.delete("javascriptEnabled")
-            caps.css_selectors_enabled = data.delete("cssSelectorsEnabled")
-            caps.takes_screenshot      = data.delete("takesScreenshot")
-            caps.native_events         = data.delete("nativeEvents")
-            caps.rotatable             = data.delete("rotatable")
-            caps.proxy                 = Proxy.json_create(data['proxy']) if data.has_key?('proxy')
+            caps.browser_name          = data.delete('browserName')
+            caps.version               = data.delete('version')
+            caps.platform              = data.delete('platform').downcase.tr(' ', '_').to_sym if data.key?('platform')
+            caps.javascript_enabled    = data.delete('javascriptEnabled')
+            caps.css_selectors_enabled = data.delete('cssSelectorsEnabled')
+            caps.takes_screenshot      = data.delete('takesScreenshot')
+            caps.native_events         = data.delete('nativeEvents')
+            caps.rotatable             = data.delete('rotatable')
+            caps.proxy                 = Proxy.json_create(data['proxy']) if data.key?('proxy') && !data['proxy'].empty?
 
             # any remaining pairs will be added as is, with no conversion
             caps.merge!(data)
@@ -179,6 +162,7 @@ module Selenium
           end
         end
 
+        #
         # @option :browser_name           [String] required browser name
         # @option :version                [String] required browser version number
         # @option :platform               [Symbol] one of :any, :win, :mac, or :x
@@ -213,12 +197,12 @@ module Selenium
         end
 
         def merge!(other)
-          if other.respond_to?(:capabilities, true) && other.capabilities.kind_of?(Hash)
+          if other.respond_to?(:capabilities, true) && other.capabilities.is_a?(Hash)
             @capabilities.merge! other.capabilities
-          elsif other.kind_of? Hash
+          elsif other.is_a? Hash
             @capabilities.merge! other
           else
-            raise ArgumentError, "argument should be a Hash or implement #capabilities"
+            raise ArgumentError, 'argument should be a Hash or implement #capabilities'
           end
         end
 
@@ -233,10 +217,11 @@ module Selenium
           end
         end
 
+        #
         # @api private
         #
 
-        def as_json(opts = nil)
+        def as_json(*)
           hash = {}
 
           @capabilities.each do |key, value|
@@ -259,28 +244,25 @@ module Selenium
           hash
         end
 
-        def to_json(*args)
+        def to_json(*)
           JSON.generate as_json
         end
 
         def ==(other)
-          return false unless other.kind_of? self.class
+          return false unless other.is_a? self.class
           as_json == other.as_json
         end
         alias_method :eql?, :==
 
         protected
 
-        def capabilities
-          @capabilities
-        end
+        attr_reader :capabilities
 
         private
 
         def camel_case(str)
-          str.gsub(/_([a-z])/) { $1.upcase }
+          str.gsub(/_([a-z])/) { Regexp.last_match(1).upcase }
         end
-
       end # Capabilities
     end # Remote
   end # WebDriver

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

@@ -0,0 +1,49 @@
+# 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
+
+      #
+      # Driver implementation for remote server.
+      # @api private
+      #
+
+      class Driver < WebDriver::Driver
+        include DriverExtensions::UploadsFiles
+        include DriverExtensions::TakesScreenshot
+        include DriverExtensions::HasSessionId
+        include DriverExtensions::Rotatable
+        include DriverExtensions::HasRemoteStatus
+        include DriverExtensions::HasWebStorage
+
+        def initialize(opts = {})
+          listener = opts.delete(:listener)
+          @bridge = Bridge.handshake(opts)
+          if @bridge.dialect == :oss
+            extend DriverExtensions::HasTouchScreen
+            extend DriverExtensions::HasLocation
+            extend DriverExtensions::HasNetworkConnection
+          end
+          super(@bridge, listener: listener)
+        end
+
+      end # Driver
+    end # Remote
+  end # WebDriver
+end # Selenium

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

@@ -1,5 +1,3 @@
-# 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
@@ -23,8 +21,8 @@ module Selenium
       module Http
         class Common
           MAX_REDIRECTS   = 20 # same as chromium/gecko
-          CONTENT_TYPE    = "application/json"
-          DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE }
+          CONTENT_TYPE    = 'application/json'.freeze
+          DEFAULT_HEADERS = {'Accept' => CONTENT_TYPE}.freeze
 
           attr_accessor :timeout
           attr_writer :server_url
@@ -33,27 +31,29 @@ module Selenium
             @timeout = nil
           end
 
+          def quit_errors
+            [IOError]
+          end
+
           def close
             # hook for subclasses - will be called on Driver#quit
           end
 
           def call(verb, url, command_hash)
-            url      = server_url.merge(url) unless url.kind_of?(URI)
+            url      = server_url.merge(url) unless url.is_a?(URI)
             headers  = DEFAULT_HEADERS.dup
-            headers['Cache-Control'] = "no-cache" if verb == :get
+            headers['Cache-Control'] = 'no-cache' if verb == :get
 
             if command_hash
               payload                   = JSON.generate(command_hash)
-              headers["Content-Type"]   = "#{CONTENT_TYPE}; charset=utf-8"
-              headers["Content-Length"] = payload.bytesize.to_s if [:post, :put].include?(verb)
+              headers['Content-Type']   = "#{CONTENT_TYPE}; charset=utf-8"
+              headers['Content-Length'] = payload.bytesize.to_s if [:post, :put].include?(verb)
 
-              if $DEBUG
-                puts "   >>> #{url} | #{payload}"
-                puts "     > #{headers.inspect}"
-              end
+              WebDriver.logger.info("   >>> #{url} | #{payload}")
+              WebDriver.logger.debug("     > #{headers.inspect}")
             elsif verb == :post
-              payload = "{}"
-              headers["Content-Length"] = "2"
+              payload = '{}'
+              headers['Content-Length'] = '2'
             end
 
             request verb, url, headers, payload
@@ -62,16 +62,19 @@ module Selenium
           private
 
           def server_url
-            @server_url or raise Error::WebDriverError, "server_url not set"
+            return @server_url if @server_url
+            raise Error::WebDriverError, 'server_url not set'
           end
 
-          def request(verb, url, headers, payload)
-            raise NotImplementedError, "subclass responsibility"
+          def request(*)
+            raise NotImplementedError, 'subclass responsibility'
           end
 
           def create_response(code, body, content_type)
-            code, body, content_type = code.to_i, body.to_s.strip, content_type.to_s
-            puts "<- #{body}\n" if $DEBUG
+            code = code.to_i
+            body = body.to_s.strip
+            content_type = content_type.to_s
+            WebDriver.logger.info("<- #{body}")
 
             if content_type.include? CONTENT_TYPE
               raise Error::WebDriverError, "empty body: #{content_type.inspect} (#{code})\n#{body}" if body.empty?
@@ -85,7 +88,6 @@ module Selenium
               raise Error::WebDriverError, msg
             end
           end
-
         end # Common
       end # Http
     end # Remote

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

@@ -1,5 +1,3 @@
-# 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
@@ -23,11 +21,7 @@ module Selenium
   module WebDriver
     module Remote
 
-      # added for rescue
-      Bridge::QUIT_ERRORS << Curl::Err::RecvError
-
       module Http
-
         #
         # An alternative to the default Net::HTTP client.
         #
@@ -43,14 +37,18 @@ module Selenium
 
         class Curb < Common
 
+          def quit_errors
+            [Curl::Err::RecvError] + super
+          end
+
           private
 
           def request(verb, url, headers, payload)
-            client.url     = url.to_s
+            client.url = url.to_s
 
             # workaround for http://github.com/taf2/curb/issues/issue/40
             # curb will handle this for us anyway
-            headers.delete "Content-Length"
+            headers.delete 'Content-Length'
 
             client.headers = headers
 
@@ -62,10 +60,10 @@ module Selenium
             when :get
               client.http_get
             when :post
-              client.post_body = payload || ""
+              client.post_body = payload || ''
               client.http_post
             when :put
-              client.put_data = payload || ""
+              client.put_data = payload || ''
               client.http_put
             when :delete
               client.http_delete
@@ -85,12 +83,11 @@ module Selenium
               c.max_redirects   = MAX_REDIRECTS
               c.follow_location = true
               c.timeout         = @timeout if @timeout
-              c.verbose         = !!$DEBUG
+              c.verbose         = WebDriver.logger.info?
 
               c
             )
           end
-
         end # Curb
       end # Http
     end # Remote