selenium-webdriver 2.52.0 → 2.53.0

data/CHANGES

@@ -1,3 +1,17 @@
+2.53.0 (2016-03-15)
+===================
+
+Ruby:
+  * Removed dependency on "multi_json" (issue 1632)
+  * Properly handle namespaces in install manifest of Firefox add-ons (issue 1143)
+  * Improve error handling when stopping browsers (thanks bsedat)
+  * Fix deselecting options in select lists (thanks glib-briia)
+  * Fix w3c error handling
+  * Update w3c Capabilities support
+
+IE:
+  * support for alert credentials (issue #1698, thanks Alan Baird & trabulmonkee)
+
 2.52.0 (2016-02-12)
 ===================
 

data/Gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: .
+  specs:
+    selenium-webdriver (2.53.0dev)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    builder (3.2.2)
+    childprocess (0.5.9)
+      ffi (~> 1.0, >= 1.0.11)
+    ci_reporter (1.9.3)
+      builder (>= 2.1.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.10)
+    hashdiff (0.2.3)
+    rack (1.6.4)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    rubyzip (1.2.0)
+    safe_yaml (1.0.4)
+    webmock (1.22.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket (1.2.2)
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ci_reporter (~> 1.6, >= 1.6.2)
+  rack (~> 1.0)
+  rspec (~> 2.99.0)
+  selenium-webdriver!
+  webmock (~> 1.7, >= 1.7.5)
+  yard (~> 0.8.7)
+
+BUNDLED WITH
+   1.11.2

data/lib/selenium/webdriver.rb

@@ -21,14 +21,12 @@ require 'childprocess'
 require 'tmpdir'
 require 'fileutils'
 require 'date'
+require 'json'
 
-require 'multi_json'
 require 'selenium/webdriver/common'
 
 module Selenium
   module WebDriver
-    extend JsonHelper
-
     Point     = Struct.new(:x, :y)
     Dimension = Struct.new(:width, :height)
     Location  = Struct.new(:latitude, :longitude, :altitude)

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

@@ -87,7 +87,7 @@ module Selenium
           prefs_file = prefs_file_for(dir)
 
           FileUtils.mkdir_p File.dirname(prefs_file)
-          File.open(prefs_file, "w") { |file| file << WebDriver.json_dump(prefs)  }
+          File.open(prefs_file, "w") { |file| file << JSON.generate(prefs)  }
         end
 
         def prefs
@@ -96,7 +96,7 @@ module Selenium
 
         def read_model_prefs
           return {} unless @model
-          WebDriver.json_load File.read(prefs_file_for(@model))
+          JSON.parse File.read(prefs_file_for(@model))
         end
 
         def prefs_file_for(dir)

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

@@ -80,11 +80,8 @@ module Selenium
 
             http.get("/shutdown")
           end
-
-          @process.poll_for_exit STOP_TIMEOUT
-        rescue ChildProcess::TimeoutError
-          # ok, force quit
-          @process.stop STOP_TIMEOUT
+        ensure
+          stop_process
         end
 
         def uri
@@ -105,6 +102,12 @@ module Selenium
           @process.start
         end
 
+        def stop_process
+          @process.poll_for_exit STOP_TIMEOUT
+        rescue ChildProcess::TimeoutError
+          @process.stop STOP_TIMEOUT
+        end
+
         def connect_until_stable
           socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
 

data/lib/selenium/webdriver/common.rb

@@ -59,6 +59,5 @@ require 'selenium/webdriver/common/driver_extensions/uploads_files'
 require 'selenium/webdriver/common/keys'
 require 'selenium/webdriver/common/bridge_helper'
 require 'selenium/webdriver/common/profile_helper'
-require 'selenium/webdriver/common/json_helper'
 require 'selenium/webdriver/common/driver'
 require 'selenium/webdriver/common/element'

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

@@ -43,7 +43,13 @@ module Selenium
       def text
         @bridge.getAlertText
       end
+      
+      def authenticate(username, password)
+        @bridge.setAuthentication username: username, password: password
+        accept
+      end
 
     end # Alert
   end # WebDriver
-end # Selenium
+end # Selenium
+

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

@@ -281,7 +281,7 @@ module Selenium
       #
 
       def to_json(*args)
-        WebDriver.json_dump as_json
+        JSON.generate as_json
       end
 
       #

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

@@ -217,7 +217,7 @@ module Selenium
           return Errors[code - 1] if code.is_a? Fixnum
 
           klass_name = code.split(' ').map(&:capitalize).join
-          Error.const_get("#{klass_name}Error")
+          Error.const_get("#{klass_name.gsub('Error','')}Error")
         rescue NameError
           WebDriverError
         end

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

@@ -61,6 +61,14 @@ module Selenium
         )
       end
 
+      def ci
+        if ENV['TRAVIS']
+          :travis
+        elsif ENV['JENKINS']
+          :jenkins
+        end
+      end
+
       def bitsize
         @bitsize ||= (
           if defined?(FFI::Platform::ADDRESS_SIZE)

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

@@ -38,7 +38,7 @@ module Selenium
       end
 
       def to_json(*args)
-        WebDriver.json_dump as_json
+        JSON.generate as_json
       end
 
       private
@@ -65,7 +65,7 @@ module Selenium
 
       module ClassMethods
         def from_json(json)
-          data = WebDriver.json_load(json).fetch('zip')
+          data = JSON.parse(json).fetch('zip')
 
           # can't use Tempfile here since it doesn't support File::BINARY mode on 1.8
           # can't use Dir.mktmpdir(&blk) because of http://jira.codehaus.org/browse/JRUBY-4082

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

@@ -139,7 +139,7 @@ module Selenium
       end
 
       def to_json(*args)
-        WebDriver.json_dump as_json
+        JSON.generate as_json
       end
 
       class << self

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

@@ -24,11 +24,11 @@ module Selenium
       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)
+        [:executeScript, :executeAsyncScript, :submitElement, :doubleClick, :mouseDown, :mouseUp, :mouseMoveTo, :click,
+         :sendKeysToActiveElement, :getWindowHandles, :getCurrentWindowHandle, :getWindowSize, :setWindowSize, :getWindowPosition,
+         :setWindowPosition, :maximizeWindow, :getAlertText, :acceptAlert, :dismissAlert].each do |cmd|
+          jwp = Remote::Bridge::COMMANDS[cmd]
+          Remote::W3CBridge.command(cmd, jwp.first, jwp.last)
         end
 
         def executeScript(script, *args)

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

@@ -80,11 +80,8 @@ module Selenium
 
             http.head("/shutdown")
           end
-
-          @process.poll_for_exit STOP_TIMEOUT
-        rescue ChildProcess::TimeoutError
-          # ok, force quit
-          @process.stop STOP_TIMEOUT
+        ensure
+          stop_process
         end
 
         def uri
@@ -103,6 +100,12 @@ module Selenium
           @process.start
         end
 
+        def stop_process
+          @process.poll_for_exit STOP_TIMEOUT
+        rescue ChildProcess::TimeoutError
+          @process.stop STOP_TIMEOUT
+        end
+
         def connect_until_stable
           socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
 

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

@@ -128,6 +128,10 @@ module Selenium
             @path = path
           end
 
+          def reset_path!
+            @path = nil
+          end
+
           def path
             @path ||= case Platform.os
                       when :macosx

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

@@ -21,8 +21,13 @@ module Selenium
   module WebDriver
     module Firefox
 
+      #
       # @api private
+      #
+
       class Extension
+        NAMESPACE = 'http://www.mozilla.org/2004/em-rdf#'
+
         def initialize(path)
           unless File.exist?(path)
             raise Error::WebDriverError, "could not find extension at #{path.inspect}"
@@ -61,20 +66,17 @@ module Selenium
         def read_id_from_install_rdf(directory)
           rdf_path = File.join(directory, "install.rdf")
           doc = REXML::Document.new(File.read(rdf_path))
+          namespace = doc.root.namespaces.key(NAMESPACE)
 
-          id_node = REXML::XPath.first(doc, "//em:id")
-
-          if id_node
-            id_node.text
-          else
-            attr_node = REXML::XPath.first(doc, "//@em:id")
+          if namespace
+            id_node = REXML::XPath.first(doc, "//#{namespace}:id")
+            return id_node.text if id_node
 
-            if attr_node.nil?
-              raise Error::WebDriverError, "cannot locate extension id in #{rdf_path}"
-            end
-
-            attr_node.value
+            attr_node = REXML::XPath.first(doc, "//@#{namespace}:id")
+            return attr_node.value if attr_node
           end
+
+          raise Error::WebDriverError, "cannot locate extension id in #{rdf_path}"
         end
 
       end # Extension

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

@@ -46,7 +46,7 @@ module Selenium
           end
 
           def default_preferences
-            @default_preferences ||= WebDriver.json_load(
+            @default_preferences ||= JSON.parse(
               File.read(File.expand_path("#{WebDriver.root}/selenium/webdriver/firefox/extension/prefs.json"))
             ).freeze
           end
@@ -261,7 +261,7 @@ module Selenium
               key, value = $1.strip, $2.strip
 
               # wrap the value in an array to make it a valid JSON string.
-              prefs[key] = WebDriver.json_load("[#{value}]").first
+              prefs[key] = JSON.parse("[#{value}]").first
             end
           end
 
@@ -271,7 +271,7 @@ module Selenium
         def write_prefs(prefs, path)
           File.open(path, "w") { |file|
             prefs.each do |key, value|
-              file.puts %{user_pref("#{key}", #{WebDriver.json_dump value});}
+              file.puts %{user_pref("#{key}", #{value.to_json});}
             end
           }
         end

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

@@ -79,11 +79,8 @@ module Selenium
 
             http.head("/shutdown")
           end
-
-          @process.poll_for_exit STOP_TIMEOUT
-        rescue ChildProcess::TimeoutError
-          # ok, force quit
-          @process.stop STOP_TIMEOUT
+        ensure
+          stop_process
         end
 
         def uri
@@ -102,6 +99,12 @@ module Selenium
           @process.start
         end
 
+        def stop_process
+          @process.poll_for_exit STOP_TIMEOUT
+        rescue ChildProcess::TimeoutError
+          @process.stop STOP_TIMEOUT
+        end
+
         def connect_until_stable
           @socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
 

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

@@ -75,12 +75,8 @@ module Selenium
 
             http.get("/shutdown")
           end
-
-          @process.poll_for_exit STOP_TIMEOUT
-        rescue ChildProcess::TimeoutError
-          # ok, force quit
-          @process.stop STOP_TIMEOUT
-
+        ensure
+          stop_process
           if Platform.jruby? && !$DEBUG
             @process.io.close rescue nil
           end
@@ -110,6 +106,12 @@ module Selenium
           @process.start
         end
 
+        def stop_process
+          @process.poll_for_exit STOP_TIMEOUT
+        rescue ChildProcess::TimeoutError
+          @process.stop STOP_TIMEOUT
+        end
+
         def connect_until_stable
           socket_poller = SocketPoller.new @host, @port, START_TIMEOUT
 

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

@@ -169,6 +169,10 @@ module Selenium
         def getAlertText
           execute :getAlertText
         end
+        
+        def setAuthentication(credentials)
+          execute :setAuthentication, {}, credentials
+        end
 
         #
         # navigation

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

@@ -260,7 +260,7 @@ module Selenium
         end
 
         def to_json(*args)
-          WebDriver.json_dump as_json
+          JSON.generate as_json
         end
 
         def ==(other)

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

@@ -77,7 +77,8 @@ class Selenium::WebDriver::Remote::Bridge
   command :acceptAlert,                            :post,    "session/:session_id/accept_alert"
   command :getAlertText,                           :get,     "session/:session_id/alert_text"
   command :setAlertValue,                          :post,    "session/:session_id/alert_text"
-
+  command :setAuthentication,                      :post,    "session/:session_id/alert/credentials"
+  
   #
   # target locator
   #

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

@@ -43,7 +43,7 @@ module Selenium
             headers['Cache-Control'] = "no-cache" if verb == :get
 
             if command_hash
-              payload                   = WebDriver.json_dump(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)
 
@@ -75,7 +75,7 @@ module Selenium
 
             if content_type.include? CONTENT_TYPE
               raise Error::WebDriverError, "empty body: #{content_type.inspect} (#{code})\n#{body}" if body.empty?
-              Response.new(code, WebDriver.json_load(body))
+              Response.new(code, JSON.parse(body))
             elsif code == 204
               Response.new(code)
             else