selenium-webdriver 2.53.4 → 3.0.0.beta1

data/CHANGES

@@ -1,34 +1,40 @@
-2.53.4 (2016-06-14)
+3.0.0.beta1 (2016-07-28)
 ===================
 
-Firefox:
-  * FirefoxDriver works with v47.0.1 (issue 2110)
+Ruby:
+  * Remove support for RC client
+  * Remove support for Ruby < 2.0
+  * Update code to support designated style guidelines
+  * Chrome/GeckoDriver/PhantomJS/IE/Edge drivers are refactored to use standard
+    service class (issue 1797)
+  * Option `:timeout` was removed from IE server (issue 1797)
 
-2.53.3 (2016-06-14)
-===================
+Chrome:
+  * Remove override of default chromedriver behavior for chrome.detach (issue 2418)
 
 Firefox:
-  * Fix bug with Firefox Binary & Marionette on Remote machines (issue 2281)
+  * Rename wires to geckodriver
+  * Change default usage from FirefoxDriver to geckodriver
 
-2.53.2 (2016-06-13)
-===================
-
-Ruby:
-  * Fix bug for finding binaries on Windows (issue 2271 & 2273)
-
-2.53.1 (2016-06-09)
-===================
+Safari:
+  * Initial support for Apple's Safari Driver in Sierra (issue #2475)
 
-Firefox:
-  * Support for latest geckodriver (formerly wires)
-  * Escape selector when converting to CSS (issue 2235)
+Android and iPhone:
+  * Remove support for deprecated classes (Issue #2476)
 
-2.53.0 (2016-03-16)
+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/README.md

@@ -1,8 +1,7 @@
 # selenium-webdriver
 
 This gem provides Ruby bindings for WebDriver
-and has been tested to work on MRI (1.9.2 through 2.1),
-JRuby and Rubinius.
+and has been tested to work on MRI (2.0 through 2.2),
 
 ## Install
 
@@ -17,7 +16,7 @@ JRuby and Rubinius.
 
 ## License
 
-Copyright 2009-2015 Software Freedom Conservancy
+Copyright 2009-2016 Software Freedom Conservancy
 
 Licensed to the Software Freedom Conservancy (SFC) under one
 or more contributor license agreements.  See the NOTICE file

data/lib/selenium/server.rb

@@ -22,7 +22,6 @@ require 'selenium/webdriver/common/socket_poller'
 require 'net/http'
 
 module Selenium
-
   #
   # Wraps the remote server jar
   #
@@ -66,59 +65,72 @@ module Selenium
     # Download the given version of the selenium-server-standalone jar.
     #
 
-    def self.download(required_version)
-      required_version = latest if required_version == :latest
-      download_file_name = "selenium-server-standalone-#{required_version}.jar"
+    class << self
+      def download(required_version)
+        required_version = latest if required_version == :latest
+        download_file_name = "selenium-server-standalone-#{required_version}.jar"
 
-      if File.exists? download_file_name
-        return download_file_name
-      end
+        return download_file_name if File.exist? download_file_name
 
-      begin
-        open(download_file_name, "wb") do |destination|
-          net_http.start("selenium-release.storage.googleapis.com") do |http|
-            resp = http.request_get("/#{required_version[/(\d+\.\d+)\./, 1]}/#{download_file_name}") do |response|
-              total = response.content_length
-              progress = 0
-              segment_count = 0
-
-              response.read_body do |segment|
-                progress += segment.length
-                segment_count += 1
-
-                if segment_count % 15 == 0
-                  percent = (progress.to_f / total.to_f) * 100
-                  print "#{CL_RESET}Downloading #{download_file_name}: #{percent.to_i}% (#{progress} / #{total})"
-                  segment_count = 0
-                end
+        begin
+          open(download_file_name, 'wb') do |destination|
+            net_http.start('selenium-release.storage.googleapis.com') do |http|
+              resp = http.request_get("/#{required_version[/(\d+\.\d+)\./, 1]}/#{download_file_name}") do |response|
+                total = response.content_length
+                progress = 0
+                segment_count = 0
 
-                destination.write(segment)
+                response.read_body do |segment|
+                  progress += segment.length
+                  segment_count += 1
+
+                  if segment_count % 15 == 0
+                    percent = (progress.to_f / total.to_f) * 100
+                    print "#{CL_RESET}Downloading #{download_file_name}: #{percent.to_i}% (#{progress} / #{total})"
+                    segment_count = 0
+                  end
+
+                  destination.write(segment)
+                end
               end
-            end
 
-            unless resp.kind_of? Net::HTTPSuccess
-              raise Error, "#{resp.code} for #{download_file_name}"
+              unless resp.is_a? Net::HTTPSuccess
+                raise Error, "#{resp.code} for #{download_file_name}"
+              end
             end
           end
+        rescue
+          FileUtils.rm download_file_name if File.exist? download_file_name
+          raise
         end
-      rescue
-        FileUtils.rm download_file_name if File.exists? download_file_name
-        raise
+
+        download_file_name
       end
 
-      download_file_name
-    end
+      #
+      # Ask Google Code what the latest selenium-server-standalone version is.
+      #
 
-    #
-    # Ask Google Code what the latest selenium-server-standalone version is.
-    #
+      def latest
+        require 'rexml/document'
+        net_http.start('selenium-release.storage.googleapis.com') do |http|
+          REXML::Document.new(http.get('/').body).root.get_elements('//Contents/Key').map do |e|
+            e.text[/selenium-server-standalone-(\d+\.\d+\.\d+)\.jar/, 1]
+          end.compact.max
+        end
+      end
+
+      def net_http
+        http_proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
 
-    def self.latest
-      require 'rexml/document'
-      net_http.start("selenium-release.storage.googleapis.com") do |http|
-        REXML::Document.new(http.get("/").body).root.get_elements("//Contents/Key").map { |e|
-          e.text[/selenium-server-standalone-(\d+\.\d+\.\d+)\.jar/, 1]
-        }.compact.max
+        if http_proxy
+          http_proxy = "http://#{http_proxy}" unless http_proxy.start_with?('http://')
+          uri = URI.parse(http_proxy)
+
+          Net::HTTP::Proxy(uri.host, uri.port)
+        else
+          Net::HTTP
+        end
       end
     end
 
@@ -162,7 +174,7 @@ module Selenium
       raise Errno::ENOENT, jar unless File.exist?(jar)
 
       @jar        = jar
-      @host       = "127.0.0.1"
+      @host       = '127.0.0.1'
       @port       = opts.fetch(:port, 4444)
       @timeout    = opts.fetch(:timeout, 30)
       @background = opts.fetch(:background, false)
@@ -180,7 +192,7 @@ module Selenium
 
     def stop
       begin
-        Net::HTTP.get(@host, "/selenium-server/driver/?cmd=shutDownSeleniumServer", @port)
+        Net::HTTP.get(@host, '/selenium-server/driver/?cmd=shutDownSeleniumServer', @port)
       rescue Errno::ECONNREFUSED
       end
 
@@ -195,7 +207,7 @@ module Selenium
     end
 
     def <<(arg)
-      if arg.kind_of?(Array)
+      if arg.is_a?(Array)
         @additional_args += arg
       else
         @additional_args << arg.to_s
@@ -204,19 +216,6 @@ module Selenium
 
     private
 
-    def self.net_http
-      http_proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
-
-      if http_proxy
-        http_proxy = "http://#{http_proxy}" unless http_proxy.start_with?("http://")
-        uri = URI.parse(http_proxy)
-
-        Net::HTTP::Proxy(uri.host, uri.port)
-      else
-        Net::HTTP
-      end
-    end
-
     def stop_process
       return unless @process.alive?
 
@@ -233,11 +232,11 @@ module Selenium
 
     def process
       @process ||= (
-        cp = ChildProcess.build("java", "-jar", @jar, "-port", @port.to_s, *@additional_args)
+        cp = ChildProcess.build('java', '-jar', @jar, '-port', @port.to_s, *@additional_args)
         io = cp.io
 
-        if @log.kind_of?(String)
-          @log_file = File.open(@log, "w")
+        if @log.is_a?(String)
+          @log_file = File.open(@log, 'w')
           io.stdout = io.stderr = @log_file
         elsif @log
           io.inherit!
@@ -250,20 +249,17 @@ module Selenium
     end
 
     def poll_for_service
-      unless socket.connected?
-        raise Error, "remote server not launched in #{@timeout} seconds"
-      end
+      return if socket.connected?
+      raise Error, "remote server not launched in #{@timeout} seconds"
     end
 
     def poll_for_shutdown
-      unless socket.closed?
-        raise Error, "remote server not stopped in #{@timeout} seconds"
-      end
+      return if socket.closed?
+      raise Error, "remote server not stopped in #{@timeout} seconds"
     end
 
     def socket
       @socket ||= WebDriver::SocketPoller.new(@host, @port, @timeout)
     end
-
   end # Server
 end # Selenium

data/lib/selenium/webdriver.rb

@@ -31,12 +31,10 @@ module Selenium
     Dimension = Struct.new(:width, :height)
     Location  = Struct.new(:latitude, :longitude, :altitude)
 
-    autoload :Android,   'selenium/webdriver/android'
     autoload :Chrome,    'selenium/webdriver/chrome'
     autoload :Edge,      'selenium/webdriver/edge'
     autoload :Firefox,   'selenium/webdriver/firefox'
     autoload :IE,        'selenium/webdriver/ie'
-    autoload :IPhone,    'selenium/webdriver/iphone'
     autoload :PhantomJS, 'selenium/webdriver/phantomjs'
     autoload :Remote,    'selenium/webdriver/remote'
     autoload :Safari,    'selenium/webdriver/safari'
@@ -45,13 +43,13 @@ module Selenium
     # @api private
 
     def self.root
-      @root ||= File.expand_path("../..", __FILE__)
+      @root ||= File.expand_path('../..', __FILE__)
     end
 
     #
     # Create a new Driver instance with the correct bridge for the given browser
     #
-    # @param browser [:ie, :internet_explorer, :edge, :remote, :chrome, :firefox, :ff, :android, :iphone, :phantomjs, :safari]
+    # @param browser [:ie, :internet_explorer, :edge, :remote, :chrome, :firefox, :ff, :phantomjs, :safari]
     #   the driver type to use
     # @param *rest
     #   arguments passed to Bridge.new
@@ -63,8 +61,6 @@ module Selenium
     # @see Selenium::WebDriver::IE::Bridge
     # @see Selenium::WebDriver::Edge::Bridge
     # @see Selenium::WebDriver::Chrome::Bridge
-    # @see Selenium::WebDriver::Android::Bridge
-    # @see Selenium::WebDriver::IPhone::Bridge
     # @see Selenium::WebDriver::PhantomJS::Bridge
     # @see Selenium::WebDriver::Safari::Bridge
     #
@@ -74,8 +70,9 @@ module Selenium
     #   WebDriver.for :firefox, :profile => Profile.new
     #   WebDriver.for :remote,  :url => "http://localhost:4444/wd/hub", :desired_capabilities => caps
     #
-    # One special argument is not passed on to the bridges, :listener. You can pass a listener for this option
-    # to get notified of WebDriver events. The passed object must respond to #call or implement the methods from AbstractEventListener.
+    # One special argument is not passed on to the bridges, :listener.
+    # You can pass a listener for this option to get notified of WebDriver events.
+    # The passed object must respond to #call or implement the methods from AbstractEventListener.
     #
     # @see Selenium::WebDriver::Support::AbstractEventListener
     #
@@ -83,6 +80,5 @@ module Selenium
     def self.for(*args)
       WebDriver::Driver.for(*args)
     end
-
   end # WebDriver
 end # Selenium

data/lib/selenium/webdriver/chrome.rb

@@ -25,10 +25,26 @@ require 'selenium/webdriver/chrome/profile'
 
 module Selenium
   module WebDriver
-
     module Chrome
+      MISSING_TEXT = <<-ERROR.tr("\n", '').freeze
+        Unable to find chromedriver. Please download the server from
+        http://chromedriver.storage.googleapis.com/index.html and place it
+        somewhere on your PATH. More info at https://github.com/SeleniumHQ/selenium/wiki/ChromeDriver.
+      ERROR
+
       def self.driver_path=(path)
-        Service.executable_path = path
+        Platform.assert_executable path
+        @driver_path = path
+      end
+
+      def self.driver_path
+        @driver_path ||= begin
+          path = Platform.find_binary('chromedriver')
+          raise Error::WebDriverError, MISSING_TEXT unless path
+          Platform.assert_executable path
+
+          path
+        end
       end
 
       def self.path=(path)
@@ -39,7 +55,6 @@ module Selenium
       def self.path
         @path ||= nil
       end
-
     end # Chrome
   end # WebDriver
 end # Selenium

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

@@ -20,17 +20,15 @@
 module Selenium
   module WebDriver
     module Chrome
-
       # @api private
       class Bridge < Remote::Bridge
-
         def initialize(opts = {})
           http_client = opts.delete(:http_client)
 
-          if opts.has_key?(:url)
+          if opts.key?(:url)
             url = opts.delete(:url)
           else
-            @service = Service.default_service(*extract_service_args(opts))
+            @service = Service.new(Chrome.driver_path, Service::DEFAULT_PORT, *extract_service_args(opts))
             @service.start
 
             url = @service.uri
@@ -39,11 +37,11 @@ module Selenium
           caps = create_capabilities(opts)
 
           remote_opts = {
-            :url                  => url,
-            :desired_capabilities => caps
+            url: url,
+            desired_capabilities: caps
           }
 
-          remote_opts.merge!(:http_client => http_client) if http_client
+          remote_opts[:http_client] = http_client if http_client
 
           super(remote_opts)
         end
@@ -90,24 +88,24 @@ module Selenium
           chrome_options = caps['chromeOptions'] || {}
 
           if args
-            unless args.kind_of? Array
-              raise ArgumentError, ":args must be an Array of Strings"
+            unless args.is_a? Array
+              raise ArgumentError, ':args must be an Array of Strings'
             end
 
-            chrome_options['args'] = args.map { |e| e.to_s }
+            chrome_options['args'] = args.map(&:to_s)
           end
 
           if profile
             data = profile.as_json
 
-            chrome_options.merge! 'profile'    => data['zip'],
-                                  'extensions' => data['extensions']
+            chrome_options['profile'] = data['zip']
+            chrome_options['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
-          chrome_options['detach']                   = detach.nil? || !!detach
+          chrome_options['detach']                   = true if detach
           chrome_options['noWebsiteTestingDefaults'] = true if no_website_testing_defaults
           chrome_options['prefs']                    = prefs if prefs
 
@@ -115,7 +113,7 @@ module Selenium
           caps['proxy'] = proxy if proxy
 
           # legacy options - for chromedriver < 17.0.963.0
-          caps["chrome.switches"] = chrome_options['args'] if chrome_options.member?('args')
+          caps['chrome.switches'] = chrome_options['args'] if chrome_options.member?('args')
           %w[binary detach extensions nativeEvents noWebsiteTestingDefaults prefs profile verbose].each do |key|
             caps["chrome.#{key}"] = chrome_options[key] if chrome_options.member?(key)
           end
@@ -126,13 +124,12 @@ module Selenium
         def extract_service_args(opts)
           args = []
 
-          if opts.has_key?(:service_log_path)
+          if opts.key?(:service_log_path)
             args << "--log-path=#{opts.delete(:service_log_path)}"
           end
 
           args
         end
-
       end # Bridge
     end # Chrome
   end # WebDriver