selenium-webdriver 2.48.1 → 2.49.0

data/CHANGES

@@ -1,3 +1,37 @@
+2.49.1 (UNRELEASED)
+===================
+
+Ruby:
+  * support for SessionNotCreatedError (thanks Alexander Bayandin)
+
+Safari:
+  * Limit support to OS X (issue 1186)
+  * support for multiple concurrent drivers
+
+PhantomJS:
+  * Implement Socket locking
+
+IE:
+  * support for multiple concurrent drivers
+
+Chrome:
+  * prevent 404 error when shutting down Chrome service (thanks Fumiaki MATSUSHIMA)
+  * logging turned on by default
+  * support local storage capabilities
+
+Firefox:
+  * support setting the location of Firefox binary to use when run locally
+  * add default lookup of Homebrew Cask default directory (issue 1437)
+
+W3C Specification:
+  * support for using with Remote WebDriver
+  * implement window size command
+  * implement window position command
+  * implement element size command
+  * implement element position command
+  * implement full screen window command
+  * implement page source command
+
 2.48.1 (2015-10-13)
 ===================
 

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

@@ -55,7 +55,8 @@ module Selenium
         def driver_extensions
           [
             DriverExtensions::TakesScreenshot,
-            DriverExtensions::HasInputDevices
+            DriverExtensions::HasInputDevices,
+            DriverExtensions::HasWebStorage
           ]
         end
 
@@ -103,7 +104,6 @@ module Selenium
                                   'extensions' => data['extensions']
           end
 
-
           chrome_options['binary']                   = Chrome.path if Chrome.path
           chrome_options['nativeEvents']             = true if native_events
           chrome_options['verbose']                  = true if verbose

data/lib/selenium/webdriver/chrome/service.rb

@@ -24,6 +24,7 @@ module Selenium
       #
       # @api private
       #
+
       class Service
         START_TIMEOUT       = 20
         SOCKET_LOCK_TIMEOUT = 45
@@ -77,7 +78,7 @@ module Selenium
             http.open_timeout = STOP_TIMEOUT / 2
             http.read_timeout = STOP_TIMEOUT / 2
 
-            http.head("/shutdown")
+            http.get("/shutdown")
           end
 
           @process.poll_for_exit STOP_TIMEOUT
@@ -90,6 +91,8 @@ module Selenium
           URI.parse "http://#{@host}:#{@port}"
         end
 
+        private
+
         def find_free_port
           @port = PortProber.above @port
         end
@@ -103,9 +106,9 @@ module Selenium
         end
 
         def connect_until_stable
-          @socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
+          socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
 
-          unless @socket_poller.connected?
+          unless socket_poller.connected?
             raise Error::WebDriverError, "unable to connect to chromedriver #{@host}:#{@port}"
           end
         end

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

@@ -46,14 +46,18 @@ module Selenium
           listener = opts.delete(:listener)
 
           bridge = case browser
-                   when :firefox, :ff
+                   when :firefox, :ff, :marionette
                      if Remote::W3CCapabilities.w3c?(opts)
                        Firefox::W3CBridge.new(opts)
                      else
                        Firefox::Bridge.new(opts)
                      end
                    when :remote
-                     Remote::Bridge.new(opts)
+                     if Remote::W3CCapabilities.w3c?(opts)
+                       Remote::W3CBridge.new(opts)
+                     else
+                       Remote::Bridge.new(opts)
+                     end
                    when :ie, :internet_explorer
                      IE::Bridge.new(opts)
                    when :chrome

data/lib/selenium/webdriver/common/element.rb

@@ -37,7 +37,7 @@ module Selenium
       end
 
       def ==(other)
-        other.kind_of?(self.class) && bridge.elementEquals(self, other)
+        other.kind_of?(self.class) && ref == other.ref
       end
       alias_method :eql?, :==
 

data/lib/selenium/webdriver/common/error.rb

@@ -159,7 +159,12 @@ module Selenium
       #
 
       class InvalidSelectorError < WebDriverError; end           # 32
-                                                                 # 33
+
+      #
+      # A new session could not be created.
+      #
+
+      class SessionNotCreatedError < WebDriverError; end         # 33
 
       #
       # Indicates that the target provided to the actions #move method is
@@ -202,7 +207,7 @@ module Selenium
         IMENotAvailableError,           # 30
         IMEEngineActivationFailedError, # 31
         InvalidSelectorError,           # 32
-        nil,                            # 33
+        SessionNotCreatedError,         # 33
         MoveTargetOutOfBoundsError      # 34
       ]
 

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

@@ -50,10 +50,9 @@ module Selenium
         opts[:secure] ||= false
 
         if obj = opts.delete(:expires)
-          opts[:expiry] = seconds_from(obj)
+          opts[:expiry] = seconds_from(obj).to_i
         end
 
-
         @bridge.addCookie opts
       end
 

data/lib/selenium/webdriver/common/socket_lock.rb

@@ -19,6 +19,11 @@
 
 module Selenium
   module WebDriver
+
+    #
+    # @api private
+    #
+
     class SocketLock
 
       def initialize(port, timeout)

data/lib/selenium/webdriver/common/window.rb

@@ -117,6 +117,14 @@ module Selenium
         @bridge.maximizeWindow
       end
 
+      #
+      # Make current window full screen
+      #
+
+      def full_screen
+        @bridge.fullscreenWindow
+      end
+
     end # Window
   end # WebDriver
 end # Selenium

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

@@ -22,9 +22,10 @@ module Selenium
     module Edge
 
       # @api private
-      class Bridge < Remote::Bridge
+      class Bridge < Remote::W3CBridge
 
         def initialize(opts = {})
+
           http_client = opts.delete(:http_client)
 
           if opts.has_key?(:url)
@@ -76,7 +77,7 @@ module Selenium
         private
 
         def create_capabilities(opts)
-          caps               = opts.delete(:desired_capabilities) { Remote::Capabilities.edge }
+          caps               = opts.delete(:desired_capabilities) { Remote::W3CCapabilities.edge }
           page_load_strategy = opts.delete(:page_load_strategy) || "normal"
 
           unless opts.empty?

data/lib/selenium/webdriver/edge/legacy_support.rb

@@ -0,0 +1,117 @@
+# 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 Edge
+
+      module LegacySupport
+
+          # These are commands Edge is still using from JSON Wire Protocol
+        %i(executeScript executeAsyncScript submitElement doubleClick mouseDown mouseUp mouseMoveTo
+           click sendKeysToActiveElement getWindowHandles getCurrentWindowHandle getWindowSize
+           setWindowSize getWindowPosition setWindowPosition maximizeWindow).each do |cmd|
+             jwp = Remote::Bridge::COMMANDS[cmd]
+             Remote::W3CBridge.command(cmd, jwp.first, jwp.last)
+        end
+
+        def executeScript(script, *args)
+          result = execute :executeScript, {}, :script => script, :args => args
+          unwrap_script_result result
+        end
+
+        def executeAsyncScript(script, *args)
+          result = execute :executeAsyncScript, {}, :script => script, :args => args
+          unwrap_script_result result
+        end
+
+        def submitElement(element)
+          execute :submitElement, :id => element
+        end
+
+        def doubleClick
+          execute :doubleClick
+        end
+
+        def click
+          execute :click, {}, :button => 0
+        end
+
+        def contextClick
+          execute :click, {}, :button => 2
+        end
+
+        def mouseDown
+          execute :mouseDown
+        end
+
+        def mouseUp
+          execute :mouseUp
+        end
+
+        def mouseMoveTo(element, x = nil, y = nil)
+          params = { :element => element }
+
+          if x && y
+            params.merge! :xoffset => x, :yoffset => y
+          end
+
+          execute :mouseMoveTo, {}, params
+        end
+
+        def sendKeysToActiveElement(key)
+          execute :sendKeysToActiveElement, {}, :value => key
+        end
+
+        def getCurrentWindowHandle
+          execute :getCurrentWindowHandle
+        end
+
+        def getWindowSize(handle = :current)
+          data = execute :getWindowSize, :window_handle => handle
+
+          Dimension.new data['width'], data['height']
+        end
+
+        def setWindowSize(width, height, handle = :current)
+          execute :setWindowSize, {:window_handle => handle},
+                  :width  => width,
+                  :height => height
+        end
+
+        def getWindowPosition(handle = :current)
+          data = execute :getWindowPosition, :window_handle => handle
+
+          Point.new data['x'], data['y']
+        end
+
+        def setWindowPosition(x, y, handle = :current)
+          execute :setWindowPosition, {:window_handle => handle},
+                  :x => x, :y => y
+        end
+
+        def maximizeWindow(handle = :current)
+          execute :maximizeWindow, :window_handle => handle
+        end
+
+
+      end # LegacySupport
+    end # Edge
+  end # WebDriver
+end # Selenium

data/lib/selenium/webdriver/edge/service.rb

@@ -24,6 +24,7 @@ module Selenium
       #
       # @api private
       #
+
       class Service
         START_TIMEOUT       = 20
         SOCKET_LOCK_TIMEOUT = 45
@@ -103,9 +104,9 @@ module Selenium
         end
 
         def connect_until_stable
-          @socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
+          socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
 
-          unless @socket_poller.connected?
+          unless socket_poller.connected?
             raise Error::WebDriverError, "unable to connect to MicrosoftWebDriver #{@host}:#{@port}"
           end
         end

data/lib/selenium/webdriver/firefox/binary.rb

@@ -170,6 +170,7 @@ module Selenium
 
           def macosx_path
             path = "/Applications/Firefox.app/Contents/MacOS/firefox-bin"
+            path = "~/Applications/Firefox.app/Contents/MacOS/firefox-bin" unless File.exist?(path)
             path = Platform.find_binary("firefox-bin") unless File.exist?(path)
 
             path

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

@@ -32,6 +32,8 @@ module Selenium
 
           caps = opts.delete(:desired_capabilities) { Remote::Capabilities.firefox }
 
+          Binary.path = caps[:firefox_binary] if caps[:firefox_binary]
+
           @launcher = create_launcher(port, profile)
 
           unless opts.empty?

data/lib/selenium/webdriver/firefox/extension/prefs.json

@@ -61,12 +61,14 @@
     "browser.newtabpage.enabled": false,
     "browser.startup.page": 0,
     "browser.startup.homepage": "about:blank",
+    "browser.usedOnWindows10.introURL": "about:blank",
     "dom.max_chrome_script_run_time": 30,
     "dom.max_script_run_time": 30,
     "dom.report_all_js_exceptions": true,
     "javascript.options.showInConsole": true,
     "network.http.max-connections-per-server": 10,
     "startup.homepage_welcome_url": "about:blank",
+    "startup.homepage_welcome_url.additional": "about:blank",
     "webdriver_accept_untrusted_certs": true,
     "webdriver_assume_untrusted_issuer": true
   }

data/lib/selenium/webdriver/firefox/w3c_bridge.rb

@@ -25,31 +25,14 @@ module Selenium
       class W3CBridge < Remote::W3CBridge
 
         def initialize(opts = {})
-          http_client = opts.delete(:http_client)
+          caps = opts[:desired_capabilities] ||= Remote::W3CCapabilities.firefox
+          Binary.path = caps[:firefox_binary] if caps[:firefox_binary]
 
-          if opts.has_key?(:url)
-            url = opts.delete(:url)
-          else
-            @service = Service.default_service(*extract_service_args(opts))
+          @service = Service.default_service(*extract_service_args(opts))
+          @service.start
+          opts[:url] = @service.uri
 
-            if @service.instance_variable_get("@host") == "127.0.0.1"
-              @service.instance_variable_set("@host", 'localhost')
-            end
-
-            @service.start
-
-            url = @service.uri
-          end
-
-          caps = create_capabilities(opts)
-
-          remote_opts = {
-            :url                  => url,
-            :desired_capabilities => caps
-          }
-
-          remote_opts.merge!(:http_client => http_client) if http_client
-          super(remote_opts)
+          super
         end
 
         def browser
@@ -59,7 +42,8 @@ module Selenium
         def driver_extensions
           [
             DriverExtensions::TakesScreenshot,
-            DriverExtensions::HasInputDevices
+            DriverExtensions::HasInputDevices,
+            DriverExtensions::HasWebStorage
           ]
         end
 
@@ -71,24 +55,9 @@ module Selenium
 
         private
 
-        def create_capabilities(opts)
-          caps = opts.delete(:desired_capabilities) { Remote::W3CCapabilities.firefox }
-
-          unless opts.empty?
-            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
-          end
-
-          caps
-        end
-
         def extract_service_args(opts)
-          args = []
-
-          if opts.has_key?(:service_log_path)
-            args << "--log-path=#{opts.delete(:service_log_path)}"
-          end
-
-          args
+          service_log_path = opts.delete(:service_log_path)
+          service_log_path ? ["--log-path=#{service_log_path}"] : []
         end
 
       end # W3CBridge