selenium-webdriver 2.30.0 → 2.31.0

data/CHANGES

@@ -1,3 +1,28 @@
+2.31.0 (2013-03-02)
+===================
+
+Remote:
+  * Expose session_id on the remote driver when used directly (#5240).
+Firefox:
+  * Native events in Firefox 19
+Opera:
+  * Treat UNSPECIFIED proxy type as a nil proxy (#5081).
+Other:
+  * Add ability to pass :desired_capabilities to all the Ruby drivers, not just for :remote.
+    Direct arguments take presendence. (#5078, see also https://github.com/SeleniumHQ/selenium/pull/8, https://github.com/SeleniumHQ/selenium/pull/11)
+
+2.30.0 (2013-02-20)
+===================
+
+Firefox:
+  * Firefox 19 support (for synthesized events)
+Remote:
+  * Pass along firefox_binary correctly (#5152)
+Safari:
+  * Don't overwrite Driver#browser
+Other
+  * Alert#text should raise on closed alert.
+
 2.29.0 (2013-01-21)
 ===================
 
@@ -45,7 +70,7 @@ Firefox:
   * FIXED: 4165: WebDriver fails on a machine with no IP address.
 Safari:
   * Fixed SafariDriver to allow calling .quit() consecutively without error.
-  * FIXED: 4676: Unable to fire javascript events into SVG's. 
+  * FIXED: 4676: Unable to fire javascript events into SVG's.
   * FIXED: 3969: SafariDriver should auto-dismiss alerts.
 IE:
   * FIXED: 4535: Hover still does not work perfectly in IE.

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

@@ -53,6 +53,7 @@ module Selenium
         private
 
         def create_capabilities(opts)
+          caps                        = opts.delete(:desired_capabilities) { Remote::Capabilities.chrome }
           args                        = opts.delete(:args) || opts.delete(:switches)
           native_events               = opts.delete(:native_events)
           verbose                     = opts.delete(:verbose)
@@ -65,7 +66,7 @@ module Selenium
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
           end
 
-          chrome_options = {}
+          chrome_options = caps['chromeOptions'] || {}
 
           if args
             unless args.kind_of? Array
@@ -89,7 +90,6 @@ module Selenium
           chrome_options['detach']                   = detach.nil? || !!detach
           chrome_options['noWebsiteTestingDefaults'] = true if no_website_testing_defaults
 
-          caps = Remote::Capabilities.chrome
           caps['chromeOptions'] = chrome_options
           caps['proxy'] = proxy if proxy
 

data/lib/selenium/webdriver/common.rb

@@ -31,6 +31,7 @@ require 'selenium/webdriver/common/driver_extensions/has_browser_connection'
 require 'selenium/webdriver/common/driver_extensions/has_input_devices'
 require 'selenium/webdriver/common/driver_extensions/has_web_storage'
 require 'selenium/webdriver/common/driver_extensions/has_location'
+require 'selenium/webdriver/common/driver_extensions/has_session_id'
 require 'selenium/webdriver/common/driver_extensions/has_touch_screen'
 require 'selenium/webdriver/common/driver_extensions/uploads_files'
 require 'selenium/webdriver/common/keys'

data/lib/selenium/webdriver/common/driver_extensions/has_session_id.rb

@@ -0,0 +1,22 @@
+module Selenium
+  module WebDriver
+
+    #
+    # @api private
+    #
+
+    module DriverExtensions
+      module HasSessionId
+
+        #
+        # @return [String] the session id
+        # @api public
+        #
+
+        def session_id
+          @bridge.session_id
+        end
+      end # HasSessionId
+    end # DriverExtensions
+  end # WebDriver
+end # Selenium

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

@@ -88,6 +88,16 @@ module Selenium
         !!(RUBY_PLATFORM =~ /cygwin/)
       end
 
+      def null_device
+        @null_device ||= (
+          if defined?(File::NULL)
+            File::NULL
+          else
+            Platform.windows? ? 'NUL' : '/dev/null'
+          end
+        )
+      end
+
       def wrap_in_quotes_if_necessary(str)
         windows? && !cygwin? ? %{"#{str}"} : str
       end
@@ -177,15 +187,16 @@ module Selenium
 end # Selenium
 
 if __FILE__ == $0
-  p :engine     => Selenium::WebDriver::Platform.engine,
-    :os         => Selenium::WebDriver::Platform.os,
-    :ruby187?   => Selenium::WebDriver::Platform.ruby187?,
-    :ruby19?    => Selenium::WebDriver::Platform.ruby19?,
-    :jruby?     => Selenium::WebDriver::Platform.jruby?,
-    :windows?   => Selenium::WebDriver::Platform.windows?,
-    :home       => Selenium::WebDriver::Platform.home,
-    :bitsize    => Selenium::WebDriver::Platform.bitsize,
-    :localhost  => Selenium::WebDriver::Platform.localhost,
-    :ip         => Selenium::WebDriver::Platform.ip,
-    :interfaces => Selenium::WebDriver::Platform.interfaces
+  p :engine      => Selenium::WebDriver::Platform.engine,
+    :os          => Selenium::WebDriver::Platform.os,
+    :ruby187?    => Selenium::WebDriver::Platform.ruby187?,
+    :ruby19?     => Selenium::WebDriver::Platform.ruby19?,
+    :jruby?      => Selenium::WebDriver::Platform.jruby?,
+    :windows?    => Selenium::WebDriver::Platform.windows?,
+    :home        => Selenium::WebDriver::Platform.home,
+    :bitsize     => Selenium::WebDriver::Platform.bitsize,
+    :localhost   => Selenium::WebDriver::Platform.localhost,
+    :ip          => Selenium::WebDriver::Platform.ip,
+    :interfaces  => Selenium::WebDriver::Platform.interfaces,
+    :null_device => Selenium::WebDriver::Platform.null_device
 end

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

@@ -101,6 +101,8 @@ module Selenium
 
       class << self
         def json_create(data)
+          return if data['proxyType'] == 'UNSPECIFIED'
+
           proxy = new
 
           proxy.type        = data['proxyType'].downcase.to_sym if data.has_key? 'proxyType'

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

@@ -11,7 +11,11 @@ module Selenium
           http_client = opts.delete(:http_client)
           proxy       = opts.delete(:proxy)
 
-          @launcher   = create_launcher(port, profile)
+          caps = opts.delete(:desired_capabilities) do
+            Remote::Capabilities.firefox(:native_events => DEFAULT_ENABLE_NATIVE_EVENTS)
+          end
+
+          @launcher = create_launcher(port, profile)
 
           unless opts.empty?
             raise ArgumentError, "unknown option#{'s' if opts.size != 1}: #{opts.inspect}"
@@ -19,7 +23,6 @@ module Selenium
 
           @launcher.launch
 
-          caps = Remote::Capabilities.firefox(:native_events => DEFAULT_ENABLE_NATIVE_EVENTS)
           caps.proxy = proxy if proxy
 
           remote_opts = {

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

@@ -13,6 +13,7 @@ module Selenium
         DEFAULT_TIMEOUT = 30
 
         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) }
           http_client   = opts.delete(:http_client)
@@ -20,7 +21,7 @@ module Selenium
           native_events = opts.delete(:native_events) != false
 
           @server = Server.get
-          
+
           @server.log_level = opts.delete(:log_level) if opts[:log_level]
           @server.log_file  = opts.delete(:log_file) if opts[:log_file]
 
@@ -30,7 +31,6 @@ module Selenium
 
           @port = @server.start Integer(port), timeout
 
-          caps = Remote::Capabilities.internet_explorer
           if ignore_mode
             caps['ignoreProtectedModeSettings'] = true
           end

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

@@ -2,23 +2,26 @@ module Selenium
   module WebDriver
     module PhantomJS
 
+
       # @api private
       class Bridge < Remote::Bridge
 
         def initialize(opts = {})
           http_client = opts.delete(:http_client)
+          caps        = opts.delete(:desired_capabilities) { Remote::Capabilities.phantomjs }
 
           if opts.has_key?(:url)
             url = opts.delete(:url)
           else
-            @service = Service.default_service
-            @service.start
+            args = opts.delete(:args) || caps['phantomjs.cli.args']
+            port = opts.delete(:port)
+
+            @service = Service.default_service(port)
+            @service.start(args)
 
             url = @service.uri
           end
 
-          caps = Remote::Capabilities.phantomjs
-
           remote_opts = {
             :url                  => url,
             :desired_capabilities => caps

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

@@ -24,24 +24,26 @@ module Selenium
           )
         end
 
-        def self.default_service
-          new executable_path, PortProber.above(DEFAULT_PORT)
+        def self.default_service(port = nil)
+          new executable_path, port || PortProber.above(DEFAULT_PORT)
         end
 
         def initialize(executable_path, port)
-          @uri           = URI.parse "http://#{Platform.localhost}:#{port}"
-          server_command = [executable_path, "--webdriver=#{port}"]
-
-          @process       = ChildProcess.build(*server_command)
-          @socket_poller = SocketPoller.new Platform.localhost, port, START_TIMEOUT
-
-          @process.io.inherit! if $DEBUG == true
+          @uri        = URI.parse "http://#{Platform.localhost}:#{port}"
+          @executable = executable_path
         end
 
-        def start
+        def start(args = [])
+          if @process && @process.alive?
+            raise "already started: #{@uri.inspect} #{@executable.inspect}"
+          end
+
+          @process = create_process(args)
           @process.start
 
-          unless @socket_poller.connected?
+          socket_poller = SocketPoller.new Platform.localhost, @uri.port, START_TIMEOUT
+
+          unless socket_poller.connected?
             raise Error::WebDriverError, "unable to connect to phantomjs @ #{@uri} after #{START_TIMEOUT} seconds"
           end
 
@@ -62,9 +64,27 @@ module Selenium
         rescue ChildProcess::TimeoutError
           # ok, force quit
           @process.stop STOP_TIMEOUT
+
+          if Platform.jruby? && !$DEBUG
+            @process.io.close rescue nil
+          end
         end
-      end # Service
 
+        def create_process(args)
+          server_command = [@executable, "--webdriver=#{@uri.port}", *args]
+          process = ChildProcess.build(*server_command.compact)
+
+          if $DEBUG == true
+            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')
+          end
+
+          process
+        end
+
+      end # Service
     end # PhantomJS
   end # WebDriver
 end # Service

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

@@ -76,7 +76,8 @@ module Selenium
           [
             DriverExtensions::HasInputDevices,
             DriverExtensions::UploadsFiles,
-            DriverExtensions::TakesScreenshot
+            DriverExtensions::TakesScreenshot,
+            DriverExtensions::HasSessionId
           ]
         end
 

metadata

@@ -2,7 +2,7 @@
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.30.0
+  version: 2.31.0
 platform: ruby
 authors: 
   - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-20 00:00:00 +01:00
+date: 2013-03-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -175,6 +175,7 @@ files:
   - lib/selenium/webdriver/common/driver_extensions/has_browser_connection.rb
   - lib/selenium/webdriver/common/driver_extensions/has_input_devices.rb
   - lib/selenium/webdriver/common/driver_extensions/has_location.rb
+  - lib/selenium/webdriver/common/driver_extensions/has_session_id.rb
   - lib/selenium/webdriver/common/driver_extensions/has_touch_screen.rb
   - lib/selenium/webdriver/common/driver_extensions/has_web_storage.rb
   - lib/selenium/webdriver/common/driver_extensions/rotatable.rb