selenium-webdriver 2.48.1 → 2.49.0

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

@@ -34,7 +34,7 @@ module Selenium
         def initialize(opts = {})
           caps           = opts.delete(:desired_capabilities) { Remote::Capabilities.internet_explorer }
           timeout        = opts.delete(:timeout) { DEFAULT_TIMEOUT }
-          port           = opts.delete(:port) { PortProber.above(DEFAULT_PORT) }
+          port           = opts.delete(:port) { DEFAULT_PORT }
           http_client    = opts.delete(:http_client)
           ignore_mode    = opts.delete(:introduce_flakiness_by_ignoring_security_domains)
           native_events  = opts.delete(:native_events) != false

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

@@ -20,9 +20,16 @@
 module Selenium
   module WebDriver
     module IE
+
+      #
+      # @api private
+      #
+
       class Server
 
-        STOP_TIMEOUT = 5
+        STOP_TIMEOUT        = 5
+        SOCKET_LOCK_TIMEOUT = 45
+        MISSING_TEXT        = "Unable to find standalone executable. Please download the IEDriverServer from http://selenium-release.storage.googleapis.com/index.html and place the executable on your PATH."
 
         def self.get(opts = {})
           binary = IE.driver_path || Platform.find_binary("IEDriverServer")
@@ -30,8 +37,7 @@ module Selenium
           if binary
             new binary, opts
           else
-            raise Error::WebDriverError,
-              "Unable to find standalone executable. Please download the IEDriverServer from http://selenium-release.storage.googleapis.com/index.html and place the executable on your PATH."
+            raise Error::WebDriverError, MISSING_TEXT
           end
         end
 
@@ -52,23 +58,19 @@ module Selenium
           unless opts.empty?
             raise ArgumentError, "invalid option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
-
         end
 
         def start(port, timeout)
           return @port if running?
 
           @port = port
-
-          @process = ChildProcess.new(@binary_path, *server_args)
-          @process.io.inherit! if $DEBUG
-          @process.start
-
-          unless SocketPoller.new(Platform.localhost, @port, timeout).connected?
-            raise Error::WebDriverError, "unable to connect to IE server within #{timeout} seconds"
+          socket_lock.locked do
+            find_free_port
+            start_process
+            connect_until_stable(timeout)
           end
 
-          Platform.exit_hook { stop }
+          Platform.exit_hook { stop } # make sure we don't leave the server running
 
           @port
         end
@@ -103,6 +105,28 @@ module Selenium
           args
         end
 
+        def find_free_port
+          @port = PortProber.above @port
+        end
+
+        def start_process
+          @process = ChildProcess.new(@binary_path, *server_args)
+          @process.io.inherit! if $DEBUG
+          @process.start
+        end
+
+        def connect_until_stable(timeout)
+          socket_poller = SocketPoller.new Platform.localhost, @port, timeout
+
+          unless socket_poller.connected?
+            raise Error::WebDriverError, "unable to connect to IE server within #{timeout} seconds"
+          end
+        end
+
+        def socket_lock
+          @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
+        end
+
       end # Server
     end # IE
   end # WebDriver

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

@@ -26,12 +26,11 @@ module Selenium
       #
 
       class Service
-        START_TIMEOUT = 20
-        STOP_TIMEOUT  = 5
-        DEFAULT_PORT  = 8910
-        MISSING_TEXT  = "Unable to find phantomjs executable."
-
-        attr_reader :uri
+        START_TIMEOUT       = 20
+        SOCKET_LOCK_TIMEOUT = 45
+        STOP_TIMEOUT        = 5
+        DEFAULT_PORT        = 8910
+        MISSING_TEXT        = "Unable to find phantomjs executable."
 
         def self.executable_path
           @executable_path ||= (
@@ -44,35 +43,33 @@ module Selenium
         end
 
         def self.default_service(port = nil)
-          new executable_path, port || PortProber.above(DEFAULT_PORT)
+          new executable_path, DEFAULT_PORT
         end
 
         def initialize(executable_path, port)
-          @uri        = URI.parse "http://#{Platform.localhost}:#{port}"
+          @host       = Platform.localhost
           @executable = executable_path
+          @port       = Integer(port)
         end
 
         def start(args = [])
           if @process && @process.alive?
-            raise "already started: #{@uri.inspect} #{@executable.inspect}"
+            raise "already started: #{uri.inspect} #{@executable.inspect}"
           end
 
-          @process = create_process(args)
-          @process.start
-
-          socket_poller = SocketPoller.new Platform.localhost, @uri.port, START_TIMEOUT
+          Platform.exit_hook { stop } # make sure we don't leave the server running
 
-          unless socket_poller.connected?
-            raise Error::WebDriverError, "unable to connect to phantomjs @ #{@uri} after #{START_TIMEOUT} seconds"
+          socket_lock.locked do
+            find_free_port
+            start_process(args)
+            connect_until_stable
           end
-
-          Platform.exit_hook { stop } # make sure we don't leave the server running
         end
 
         def stop
           return if @process.nil? || @process.exited?
 
-          Net::HTTP.start(uri.host, uri.port) do |http|
+          Net::HTTP.start(@host, @port) do |http|
             http.open_timeout = STOP_TIMEOUT / 2
             http.read_timeout = STOP_TIMEOUT / 2
 
@@ -89,21 +86,43 @@ module Selenium
           end
         end
 
-        def create_process(args)
-          server_command = [@executable, "--webdriver=#{@uri.port}", *args]
-          process = ChildProcess.build(*server_command.compact)
+        def find_free_port
+          @port = PortProber.above @port
+        end
+
+        def uri
+          URI.parse "http://#{@host}:#{@port}"
+        end
+
+        private
+
+        def start_process(args)
+          server_command = [@executable, "--webdriver=#{@port}", *args]
+          @process = ChildProcess.build(*server_command.compact)
 
           if $DEBUG == true
-            process.io.inherit!
+            @process.io.inherit!
           elsif Platform.jruby?
             # apparently we need to read the output for phantomjs to work on jruby
-            process.io.stdout = process.io.stderr = File.new(Platform.null_device, 'w')
+            @process.io.stdout = @process.io.stderr = File.new(Platform.null_device, 'w')
+          end
+
+          @process.start
+        end
+
+        def connect_until_stable
+          socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
+
+          unless socket_poller.connected?
+            raise Error::WebDriverError, "unable to connect to phantomjs @ #{uri} after #{START_TIMEOUT} seconds"
           end
+        end
 
-          process
+        def socket_lock
+          @socket_lock ||= SocketLock.new(@port - 1, SOCKET_LOCK_TIMEOUT)
         end
 
       end # Service
     end # PhantomJS
   end # WebDriver
-end # Service
+end # Service

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

@@ -106,7 +106,8 @@ module Selenium
             DriverExtensions::HasTouchScreen,
             DriverExtensions::HasLocation,
             DriverExtensions::HasNetworkConnection,
-            DriverExtensions::HasRemoteStatus
+            DriverExtensions::HasRemoteStatus,
+            DriverExtensions::HasWebStorage
           ]
         end
 
@@ -153,28 +154,20 @@ module Selenium
         # alerts
         #
 
-        def getAlert
-          execute :getAlert
-        end
-
         def acceptAlert
-          command = :acceptAlert
-          execute command
+          execute :acceptAlert
         end
 
         def dismissAlert
-          command = :dismissAlert
-          execute command
+          execute :dismissAlert
         end
 
         def setAlertValue(keys)
-          command = capabilities.browser_name == 'MicrosoftEdge' ? :setAlertValueW3C : :setAlertValue
-          execute command, {}, :text => keys.to_s
+          execute :setAlertValue, {}, :text => keys.to_s
         end
 
         def getAlertText
-          command = :getAlertText
-          execute command
+          execute :getAlertText
         end
 
         #
@@ -201,20 +194,8 @@ module Selenium
           execute :getPageSource
         end
 
-        def getVisible
-          execute :getVisible
-        end
-
-        def setVisible(bool)
-          execute :setVisible, {}, bool
-        end
-
         def switchToWindow(name)
-          if capabilities.browser_name == 'MicrosoftEdge'
-            execute :switchToWindow, {}, :handle => name
-          else
-            execute :switchToWindow, {}, :name => name
-          end
+          execute :switchToWindow, {}, :name => name
         end
 
         def switchToFrame(id)
@@ -458,7 +439,6 @@ module Selenium
           execute :clearElement, :id => element
         end
 
-
         def submitElement(element)
           execute :submitElement, :id => element
         end
@@ -534,7 +514,11 @@ module Selenium
           data = execute :getLog, {}, :type => type.to_s
 
           Array(data).map do |l|
-            LogEntry.new l.fetch('level'), l.fetch('timestamp'), l.fetch('message')
+            begin
+              LogEntry.new l.fetch('level', 'UNKNOWN'), l.fetch('timestamp'), l.fetch('message')
+            rescue KeyError
+              next
+            end
           end
         end
 
@@ -587,14 +571,11 @@ module Selenium
         def isElementDisplayed(element)
           execute :isElementDisplayed, :id => element
         end
+
         def getElementValueOfCssProperty(element, prop)
           execute :getElementValueOfCssProperty, :id => element, :property_name => prop
         end
 
-        def elementEquals(element, other)
-          element.ref == other.ref
-        end
-
         #
         # finding elements
         #
@@ -627,7 +608,7 @@ module Selenium
         private
 
         def assert_javascript_enabled
-          return if capabilities.browser_name == 'MicrosoftEdge' || capabilities.javascript_enabled?
+          return if capabilities.javascript_enabled?
           raise Error::UnsupportedOperationError, "underlying webdriver instance does not support javascript"
         end
 

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

@@ -74,18 +74,19 @@ module Selenium
             new({
               :browser_name          => "chrome",
               :javascript_enabled    => true,
-              :css_selectors_enabled => true
-            }.merge(opts))
+              :css_selectors_enabled => true,
+              :loggingPrefs => {:browser => "ALL",
+                                :driver => "ALL"}
+                }.merge(opts))
           end
 
           def edge(opts = {})
-            new({
-              :browser_name       => "MicrosoftEdge",
-              :platform           => :windows,
-            }.merge(opts))
+            W3CCapabilities.edge(opts)
           end
 
           def firefox(opts = {})
+            return W3CCapabilities.firefox(opts) if opts[:marionette]
+
             new({
               :browser_name          => "firefox",
               :javascript_enabled    => true,
@@ -146,6 +147,7 @@ module Selenium
           def safari(opts = {})
             new({
               :browser_name          => "safari",
+              :platform              => :mac,
               :javascript_enabled    => true,
               :takes_screenshot      => true,
               :css_selectors_enabled => true

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

@@ -78,11 +78,6 @@ class Selenium::WebDriver::Remote::Bridge
   command :getAlertText,                           :get,     "session/:session_id/alert_text"
   command :setAlertValue,                          :post,    "session/:session_id/alert_text"
 
-  command :dismissAlertW3C,                           :post,    "session/:session_id/alert/dismiss"
-  command :acceptAlertW3C,                            :post,    "session/:session_id/alert/accept"
-  command :getAlertTextW3C,                           :get,     "session/:session_id/alert/text"
-  command :setAlertValueW3C,                          :post,    "session/:session_id/alert/text"
-
   #
   # target locator
   #

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

@@ -17,6 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'json'
+
 module Selenium
   module WebDriver
     module Remote
@@ -60,22 +62,27 @@ module Selenium
         #
 
         def initialize(opts = {})
+          if opts.fetch(:desired_capabilities, {})[:browser_name] == 'MicrosoftEdge'
+            require_relative '../edge/legacy_support'
+            extend Edge::LegacySupport
+          end
+
           opts = opts.dup
 
           http_client          = opts.delete(:http_client) { Http::Default.new }
           desired_capabilities = opts.delete(:desired_capabilities) { W3CCapabilities.firefox }
           url                  = opts.delete(:url) { "http://#{Platform.localhost}:4444/wd/hub" }
 
-          unless opts.empty?
-            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
-          end
+          desired_capabilities = W3CCapabilities.send(desired_capabilities) if desired_capabilities.is_a? Symbol
+
+          desired_capabilities[:marionette] = opts.delete(:marionette) unless opts[:marionette].nil?
 
-          if desired_capabilities.kind_of?(Symbol)
-            unless W3CCapabilities.respond_to?(desired_capabilities)
-              raise Error::WebDriverError, "invalid desired capability: #{desired_capabilities.inspect}"
-            end
+          if desired_capabilities[:marionette] && Firefox::Binary.version < 45
+              raise Error::WebDriverError, "Marionette is not supported in Firefox Version #{Firefox::Binary.version}"
+          end
 
-            desired_capabilities = W3CCapabilities.send(desired_capabilities)
+          unless opts.empty?
+            raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
           uri = url.kind_of?(URI) ? url : URI.parse(url)
@@ -85,7 +92,6 @@ module Selenium
 
           @http          = http_client
           @capabilities  = create_session(desired_capabilities)
-
           @file_detector = nil
         end
 
@@ -104,9 +110,8 @@ module Selenium
             DriverExtensions::HasSessionId,
             DriverExtensions::Rotatable,
             DriverExtensions::HasTouchScreen,
-            DriverExtensions::HasLocation,
-            DriverExtensions::HasNetworkConnection,
-            DriverExtensions::HasRemoteStatus
+            DriverExtensions::HasRemoteStatus,
+            DriverExtensions::HasWebStorage
           ]
         end
 
@@ -126,6 +131,8 @@ module Selenium
         end
 
         def status
+          jwp = Selenium::WebDriver::Remote::Bridge::COMMANDS[:status]
+          self.class.command(:status, jwp.first, jwp.last)
           execute :status
         end
 
@@ -133,10 +140,6 @@ module Selenium
           execute :get, {}, :url => url
         end
 
-        def getCapabilities
-          W3CCapabilities.json_create execute(:getCapabilities)
-        end
-
         def setImplicitWaitTimeout(milliseconds)
           setTimeout('implicit', milliseconds)
         end
@@ -153,10 +156,6 @@ module Selenium
         # alerts
         #
 
-        def getAlert
-          execute :getAlert
-        end
-
         def acceptAlert
           execute :acceptAlert
         end
@@ -194,15 +193,9 @@ module Selenium
         end
 
         def getPageSource
-          execute :getPageSource
-        end
-
-        def getVisible
-          execute :getVisible
-        end
-
-        def setVisible(bool)
-          execute :setVisible, {}, bool
+          executeScript("var source = document.documentElement.outerHTML;" +
+                            "if (!source) { source = new XMLSerializer().serializeToString(document); }" +
+                            "return source;")
         end
 
         def switchToWindow(name)
@@ -210,16 +203,8 @@ module Selenium
         end
 
         def switchToFrame(id)
-          locator  = case id
-                     when String
-                       find_element_by('id', id)
-                     when Hash
-                       find_element_by(id.keys.first.to_s, id.values.first)
-                     else
-                       id
-                     end
-
-          execute :switchToFrame, {}, :id => locator
+          id = find_element_by('id', id) if id.is_a? String
+          execute :switchToFrame, {}, :id => id
         end
 
         def switchToParentFrame
@@ -258,31 +243,40 @@ module Selenium
           execute :getWindowHandle
         end
 
-        # TODO - These Commands might require checking for being
-        # current window before performing
         def setWindowSize(width, height, handle = :current)
+          unless handle == :current
+            raise Error::WebDriverError, 'Switch to desired window before changing its size'
+          end
           execute :setWindowSize, {}, {:width  => width,
                                    :height => height}
         end
 
         def maximizeWindow(handle = :current)
+          unless handle == :current
+            raise Error::WebDriverError, 'Switch to desired window before changing its size'
+          end
           execute :maximizeWindow
         end
 
+        def fullscreenWindow
+          execute :fullscreenWindow
+        end
+
         def getWindowSize(handle = :current)
+          unless handle == :current
+            raise Error::WebDriverError, 'Switch to desired window before getting its size'
+          end
           data = execute :getWindowSize
 
           Dimension.new data['width'], data['height']
         end
 
-        def setWindowPosition(x, y, handle = :current)
-          execute :setWindowPosition, :x => x, :y => y
+        def setWindowPosition(_x, _y, _handle = nil)
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support setting the Window Position'
         end
 
-        def getWindowPosition(handle = :current)
-          data = execute :getWindowPosition
-
-          Point.new data['x'], data['y']
+        def getWindowPosition(_handle = nil)
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support getting the Window Position'
         end
 
         def getScreenshot
@@ -294,69 +288,67 @@ module Selenium
         #
 
         def getLocalStorageItem(key)
-          execute :getLocalStorageItem, :key => key
+          executeScript("return localStorage.getItem('#{key}')")
         end
 
         def removeLocalStorageItem(key)
-          execute :removeLocalStorageItem, :key => key
+          executeScript("localStorage.removeItem('#{key}')")
         end
 
         def getLocalStorageKeys
-          execute :getLocalStorageKeys
+          executeScript("return Object.keys(localStorage)")
         end
 
         def setLocalStorageItem(key, value)
-          execute :setLocalStorageItem, {}, :key => key, :value => value
+          executeScript("localStorage.setItem('#{key}', '#{value}')")
         end
 
         def clearLocalStorage
-          execute :clearLocalStorage
+          executeScript("localStorage.clear()")
         end
 
         def getLocalStorageSize
-          execute :getLocalStorageSize
+          executeScript("return localStorage.length")
         end
 
         def getSessionStorageItem(key)
-          execute :getSessionStorageItem, :key => key
+          executeScript("return sessionStorage.getItem('#{key}')")
         end
 
         def removeSessionStorageItem(key)
-          execute :removeSessionStorageItem, :key => key
+          executeScript("sessionStorage.removeItem('#{key}')")
         end
 
         def getSessionStorageKeys
-          execute :getSessionStorageKeys
+          executeScript("return Object.keys(sessionStorage)")
         end
 
         def setSessionStorageItem(key, value)
-          execute :setSessionStorageItem, {}, :key => key, :value => value
+          executeScript("sessionStorage.setItem('#{key}', '#{value}')")
         end
 
         def clearSessionStorage
-          execute :clearSessionStorage
+          executeScript("sessionStorage.clear()")
         end
 
         def getSessionStorageSize
-          execute :getSessionStorageSize
+          executeScript("return sessionStorage.length")
         end
 
         def getLocation
-          obj = execute(:getLocation) || {} # android returns null
-          Location.new obj['latitude'], obj['longitude'], obj['altitude']
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support getting location'
         end
 
-        def setLocation(lat, lon, alt)
-          loc = {:latitude => lat, :longitude => lon, :altitude => alt}
-          execute :setLocation, {}, :location => loc
+        def setLocation(_lat, _lon, _alt)
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support setting location'
         end
 
         def getNetworkConnection
-          execute :getNetworkConnection
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support getting network connection'
         end
 
-        def setNetworkConnection(type)
-          execute :setNetworkConnection, {}, :parameters => {:type => type}
+        def setNetworkConnection(_type)
+          raise Error::WebDriverError::UnsupportedOperationError, 'The W3C standard does not currently support setting network connection'
         end
 
         #
@@ -378,7 +370,7 @@ module Selenium
         #
 
         def addCookie(cookie)
-          execute :addCookie, {}, cookie
+          execute :addCookie, {}, :cookie => cookie
         end
 
         def deleteCookie(name)
@@ -440,23 +432,15 @@ module Selenium
           sendKeysToElement(getActiveElement, keys)
         end
 
+        # TODO - Implement file verification
         def sendKeysToElement(element, keys)
           execute :elementSendKeys, {:id => element}, {:value => keys.join('').split(//)}
         end
 
-        def upload(local_file)
-          unless File.file?(local_file)
-            raise Error::WebDriverError, "you may only upload files: #{local_file.inspect}"
-          end
-
-          execute :uploadFile, {}, :file => Zipper.zip_file(local_file)
-        end
-
         def clearElement(element)
           execute :elementClear, :id => element
         end
 
-
         def submitElement(element)
           executeScript("var e = arguments[0].ownerDocument.createEvent('Event');" +
                             "e.initEvent('submit', true, true);" +
@@ -542,19 +526,18 @@ module Selenium
         end
 
         def getElementLocation(element)
-          data = execute :getElementLocation, :id => element
+          data = execute :getElementRect, :id => element
 
           Point.new data['x'], data['y']
         end
 
         def getElementLocationOnceScrolledIntoView(element)
-          data = execute :getElementLocationOnceScrolledIntoView, :id => element
-
-          Point.new data['x'], data['y']
+          sendKeysToElement(element, [''])
+          getElementLocation(element)
         end
 
         def getElementSize(element)
-          data = execute :getElementSize, :id => element
+          data = execute :getElementRect, :id => element
 
           Dimension.new data['width'], data['height']
         end
@@ -568,16 +551,15 @@ module Selenium
         end
 
         def isElementDisplayed(element)
+          jwp = Selenium::WebDriver::Remote::Bridge::COMMANDS[:isElementDisplayed]
+          self.class.command(:isElementDisplayed, jwp.first, jwp.last)
           execute :isElementDisplayed, :id => element
         end
+
         def getElementValueOfCssProperty(element, prop)
           execute :getElementCssValue, :id => element, :property_name => prop
         end
 
-        def elementEquals(element, other)
-          element.ref == other.ref
-        end
-
         #
         # finding elements
         #