selenium-webdriver 2.53.4 → 3.0.0.beta1

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

@@ -25,25 +25,24 @@ module Selenium
       # server is being asked to create.
       #
       class W3CCapabilities
-
         DEFAULTS = {
-          :browser_name => '',
-          :browser_version => :any,
-          :platform_name => :any,
-          :platform_version => :any,
-          :accept_ssl_certs => false,
-          :page_load_strategy => 'normal',
-          :proxy => nil
-        }
+          browser_name: '',
+          browser_version: :any,
+          platform_name: :any,
+          platform_version: :any,
+          accept_ssl_certs: false,
+          page_load_strategy: 'normal',
+          proxy: nil
+        }.freeze
 
         KNOWN = [
-            :remote_session_id,
-            :xul_app_id,
-            :raise_accessibility_exceptions,
-            :rotatable,
-            :app_build_id,
-            :device
-        ]
+          :remote_session_id,
+          :xul_app_id,
+          :raise_accessibility_exceptions,
+          :rotatable,
+          :app_build_id,
+          :device
+        ].freeze
 
         (DEFAULTS.keys + KNOWN).each do |key|
           define_method key do
@@ -69,28 +68,24 @@ module Selenium
         #
 
         class << self
-
           def edge(opts = {})
             new({
-              :browser_name => "MicrosoftEdge",
-              :platform => :windows,
-                }.merge(opts))
+              browser_name: 'MicrosoftEdge',
+              platform: :windows
+            }.merge(opts))
           end
 
           def firefox(opts = {})
             opts[:browser_version] = opts.delete :version
             opts[:platform_name] = opts.delete :platform
 
-            new({
-              :browser_name => "firefox",
-              :marionette => true
-                }.merge(opts))
+            new({browser_name: 'firefox'}.merge(opts))
           end
 
           alias_method :ff, :firefox
 
           def w3c?(opts = {})
-            opts[:desired_capabilities].is_a?(W3CCapabilities) || opts[:marionette]
+            !opts[:desired_capabilities].is_a?(Capabilities)
           end
 
           #
@@ -101,16 +96,16 @@ module Selenium
             data = data.dup
 
             # Convert due to Remote Driver implementation
-            data["browserVersion"] = data.delete("version") if data.key? "version"
-            data["platformName"] = data.delete("platform") if data.key? "platform"
+            data['browserVersion'] = data.delete('version') if data.key? 'version'
+            data['platformName'] = data.delete('platform') if data.key? 'platform'
 
             caps = new
-            caps.browser_name = data.delete("browserName") if data.key? "browserName"
-            caps.browser_version = data.delete("browserVersion") if data.key? "browserVersion"
-            caps.platform_name = data.delete("platformName") if data.key? "platformName"
-            caps.platform_version = data.delete("platformVersion") if data.key? "platformVersion"
-            caps.accept_ssl_certs = data.delete("acceptSslCerts") if data.key? "acceptSslCerts"
-            caps.page_load_strategy = data.delete("pageLoadStrategy") if data.key? "pageloadStrategy"
+            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_ssl_certs = data.delete('acceptSslCerts')
+            caps.page_load_strategy = data.delete('pageLoadStrategy')
             proxy = data.delete('proxy')
             caps.proxy = Proxy.json_create(proxy) unless proxy.nil? || proxy.empty?
 
@@ -118,11 +113,11 @@ module Selenium
             caps[:remote_session_id] = data.delete('webdriver.remote.sessionid')
 
             # Obsolete capabilities returned by Remote Server
-            data.delete("javascriptEnabled")
+            data.delete('javascriptEnabled')
             data.delete('cssSelectorsEnabled')
 
             # Marionette Specific
-            caps[:xul_app_id] = data.delete("XULappId")
+            caps[:xul_app_id] = data.delete('XULappId')
             caps[:raise_accessibility_exceptions] = data.delete('raisesAccessibilityExceptions')
             caps[:rotatable] = data.delete('rotatable')
             caps[:app_build_id] = data.delete('appBuildId')
@@ -163,12 +158,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
 
@@ -186,7 +181,7 @@ module Selenium
         # @api private
         #
 
-        def as_json(opts = nil)
+        def as_json(*)
           hash = {}
 
           @capabilities.each do |key, value|
@@ -207,12 +202,12 @@ 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
 
@@ -220,16 +215,13 @@ module Selenium
 
         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 # W3CCapabilities
     end # Remote
   end # WebDriver

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

@@ -17,116 +17,119 @@
 # specific language governing permissions and limitations
 # under the License.
 
-class Selenium::WebDriver::Remote::W3CBridge
-
-  #
-  # http://www.w3.org/TR/2015/WD-webdriver-20150918/#list-of-endpoints
-  #
-
-  #
-  # session handling
-  #
-
-  command :newSession,                 :post,    "session"
-  command :deleteSession,              :delete,  "session/:session_id"
-
-
-  #
-  # basic driver
-  #
-
-  command :get,                        :post,    "session/:session_id/url"
-  command :getCurrentUrl,              :get,     "session/:session_id/url"
-  command :back,                       :post,    "session/:session_id/back"
-  command :forward,                    :post,    "session/:session_id/forward"
-  command :refresh,                    :post,    "session/:session_id/refresh"
-  command :getTitle,                   :get,     "session/:session_id/title"
-
-  #
-  # window and Frame handling
-  #
-
-  command :getWindowHandle,            :get,     "session/:session_id/window"
-  command :closeWindow,                :delete,  "session/:session_id/window"
-  command :switchToWindow,             :post,    "session/:session_id/window"
-  command :getWindowHandles,           :get,     "session/:session_id/window/handles"
-  command :fullscreenWindow,           :post,    "session/:session_id/window/fullscreen"
-  command :maximizeWindow,             :post,    "session/:session_id/window/maximize"
-  command :setWindowSize,              :post,    "session/:session_id/window/size"
-  command :getWindowSize,              :get,     "session/:session_id/window/size"
-  command :switchToFrame,              :post,    "session/:session_id/frame"
-  command :switchToParentFrame,        :post,    "session/:session_id/frame/parent"
-
-  #
-  # element
-  #
-
-  command :findElement,                :post,    "session/:session_id/element"
-  command :findElements,               :post,    "session/:session_id/elements"
-  command :findChildElement,           :post,    "session/:session_id/element/:id/element"
-  command :findChildElements,          :post,    "session/:session_id/element/:id/elements"
-  command :getActiveElement,           :get,     "session/:session_id/element/active"
-  command :isElementSelected,          :get,     "session/:session_id/element/:id/selected"
-  command :getElementAttribute,        :get,     "session/:session_id/element/:id/attribute/:name"
-  command :getElementProperty,         :get,     "session/:session_id/element/:id/property/:name"
-  command :getElementCssValue,         :get,     "session/:session_id/element/:id/css/:property_name"
-  command :getElementText,             :get,     "session/:session_id/element/:id/text"
-  command :getElementTagName,          :get,     "session/:session_id/element/:id/name"
-  command :getElementRect,             :get,     "session/:session_id/element/:id/rect"
-  command :isElementEnabled,           :get,     "session/:session_id/element/:id/enabled"
-
-  #
-  # script execution
-  #
-
-  command :executeScript,              :post,    "session/:session_id/execute/sync"
-  command :executeAsyncScript,         :post,    "session/:session_id/execute/async"
-
-  #
-  # cookies
-  #
-
-  command :getAllCookies,              :get,     "session/:session_id/cookie"
-  command :getCookie,                  :get,     "session/:session_id/cookie/:name"
-  command :addCookie,                  :post,    "session/:session_id/cookie"
-  command :deleteCookie,               :delete,  "session/:session_id/cookie/:name"
-
-  #
-  # timeouts
-  #
-
-  command :setTimeout,                 :post,    "session/:session_id/timeouts"
-
-  #
-  # actions
-  #
-
-  command :actions,                    :post,    "session/:session_id/actions"
-
-
-  #
-  # Element Operations
-  #
-
-  command :elementClick,               :post,    "session/:session_id/element/:id/click"
-  command :elementTap,                 :post,    "session/:session_id/element/:id/tap"
-  command :elementClear,               :post,    "session/:session_id/element/:id/clear"
-  command :elementSendKeys,            :post,    "session/:session_id/element/:id/value"
-
-  #
-  # alerts
-  #
-
-  command :dismissAlert,               :post,    "session/:session_id/alert/dismiss"
-  command :acceptAlert,                :post,    "session/:session_id/alert/accept"
-  command :getAlertText,               :get,     "session/:session_id/alert/text"
-  command :sendAlertText,              :post,    "session/:session_id/alert/text"
-
-  #
-  # screenshot
-  #
-
-  command :takeScreenshot,             :get,     "session/:session_id/screenshot"
-  command :takeElementScreenshot,      :get,     "session/:session_id/element/:id/screenshot"
-
-end
+module Selenium
+  module WebDriver
+    module Remote
+      class W3CBridge
+        #
+        # http://www.w3.org/TR/2015/WD-webdriver-20150918/#list-of-endpoints
+        #
+
+        #
+        # session handling
+        #
+
+        command :newSession, :post, 'session'
+        command :deleteSession, :delete, 'session/:session_id'
+
+        #
+        # basic driver
+        #
+
+        command :get, :post, 'session/:session_id/url'
+        command :getCurrentUrl, :get, 'session/:session_id/url'
+        command :back, :post, 'session/:session_id/back'
+        command :forward, :post, 'session/:session_id/forward'
+        command :refresh, :post, 'session/:session_id/refresh'
+        command :getTitle, :get, 'session/:session_id/title'
+
+        #
+        # window and Frame handling
+        #
+
+        command :getWindowHandle, :get, 'session/:session_id/window'
+        command :closeWindow, :delete, 'session/:session_id/window'
+        command :switchToWindow, :post, 'session/:session_id/window'
+        command :getWindowHandles, :get, 'session/:session_id/window/handles'
+        command :fullscreenWindow, :post, 'session/:session_id/window/fullscreen'
+        command :maximizeWindow, :post, 'session/:session_id/window/maximize'
+        command :setWindowSize, :post, 'session/:session_id/window/size'
+        command :getWindowSize, :get, 'session/:session_id/window/size'
+        command :switchToFrame, :post, 'session/:session_id/frame'
+        command :switchToParentFrame, :post, 'session/:session_id/frame/parent'
+
+        #
+        # element
+        #
+
+        command :findElement, :post, 'session/:session_id/element'
+        command :findElements, :post, 'session/:session_id/elements'
+        command :findChildElement, :post, 'session/:session_id/element/:id/element'
+        command :findChildElements, :post, 'session/:session_id/element/:id/elements'
+        command :getActiveElement, :get, 'session/:session_id/element/active'
+        command :isElementSelected, :get, 'session/:session_id/element/:id/selected'
+        command :getElementAttribute, :get, 'session/:session_id/element/:id/attribute/:name'
+        command :getElementProperty, :get, 'session/:session_id/element/:id/property/:name'
+        command :getElementCssValue, :get, 'session/:session_id/element/:id/css/:property_name'
+        command :getElementText, :get, 'session/:session_id/element/:id/text'
+        command :getElementTagName, :get, 'session/:session_id/element/:id/name'
+        command :getElementRect, :get, 'session/:session_id/element/:id/rect'
+        command :isElementEnabled, :get, 'session/:session_id/element/:id/enabled'
+
+        #
+        # document handling
+        #
+
+        command :getPageSource, :get, '/session/:session_id/source'
+        command :executeScript, :post, 'session/:session_id/execute/sync'
+        command :executeAsyncScript, :post, 'session/:session_id/execute/async'
+
+        #
+        # cookies
+        #
+
+        command :getAllCookies, :get, 'session/:session_id/cookie'
+        command :getCookie, :get, 'session/:session_id/cookie/:name'
+        command :addCookie, :post, 'session/:session_id/cookie'
+        command :deleteCookie, :delete, 'session/:session_id/cookie/:name'
+
+        #
+        # timeouts
+        #
+
+        command :setTimeout, :post, 'session/:session_id/timeouts'
+
+        #
+        # actions
+        #
+
+        command :actions, :post, 'session/:session_id/actions'
+
+        #
+        # Element Operations
+        #
+
+        command :elementClick, :post, 'session/:session_id/element/:id/click'
+        command :elementTap, :post, 'session/:session_id/element/:id/tap'
+        command :elementClear, :post, 'session/:session_id/element/:id/clear'
+        command :elementSendKeys, :post, 'session/:session_id/element/:id/value'
+
+        #
+        # alerts
+        #
+
+        command :dismissAlert, :post, 'session/:session_id/alert/dismiss'
+        command :acceptAlert, :post, 'session/:session_id/alert/accept'
+        command :getAlertText, :get, 'session/:session_id/alert/text'
+        command :sendAlertText, :post, 'session/:session_id/alert/text'
+
+        #
+        # screenshot
+        #
+
+        command :takeScreenshot, :get, 'session/:session_id/screenshot'
+        command :takeElementScreenshot, :get, 'session/:session_id/element/:id/screenshot'
+      end
+    end # Remote
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/safari.rb

@@ -23,6 +23,11 @@ require 'pathname'
 module Selenium
   module WebDriver
     module Safari
+      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
+        Unable to find safari extension. Please download the file from
+        http://www.seleniumhq.org/download/ and place it
+        somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/SafariDriver.
+      ERROR
 
       class << self
         def path=(path)
@@ -34,15 +39,15 @@ module Selenium
           @path ||= (
             path = case Platform.os
                    when :windows
-                     Platform.find_in_program_files("Safari\\Safari.exe")
+                     Platform.find_in_program_files('Safari\\Safari.exe')
                    when :macosx
-                     "/Applications/Safari.app/Contents/MacOS/Safari"
+                     '/Applications/Safari.app/Contents/MacOS/Safari'
                    else
-                     Platform.find_binary("Safari")
+                     Platform.find_binary('Safari')
                    end
 
             unless File.file?(path) && File.executable?(path)
-              raise Error::WebDriverError, "unable to find the Safari executable, please set Selenium::WebDriver::Safari.path= or add it to your PATH."
+              raise Error::WebDriverError, MISSING_TEXT
             end
 
             path
@@ -50,10 +55,18 @@ module Selenium
         end
 
         def resource_path
-          @resource_path ||= Pathname.new(File.expand_path("../safari/resources", __FILE__))
+          @resource_path ||= Pathname.new(File.expand_path('../safari/resources', __FILE__))
+        end
+
+        def driver_path=(path)
+          Platform.assert_executable path
+          @driver_path = path
         end
-      end
 
+        def driver_path
+          @driver_path || '/usr/bin/safaridriver'
+        end
+      end
     end # Safari
   end # WebDriver
 end # Selenium
@@ -61,5 +74,8 @@ end # Selenium
 require 'selenium/webdriver/safari/browser'
 require 'selenium/webdriver/safari/server'
 require 'selenium/webdriver/safari/options'
-require 'selenium/webdriver/safari/bridge'
+require 'selenium/webdriver/safari/legacy_bridge'
+require 'selenium/webdriver/safari/apple_bridge'
+require 'selenium/webdriver/safari/service'
 
+Selenium::WebDriver::Safari::Bridge = Selenium::WebDriver::Safari::LegacyBridge