selenium-webdriver 0.0.17 → 0.0.18

data/firefox/src/rb/lib/selenium/webdriver/firefox/extension_connection.rb

@@ -1,6 +1,8 @@
 module Selenium
   module WebDriver
     module Firefox
+
+      # @private
       class ExtensionConnection
 
         def initialize(host, port)
@@ -8,11 +10,15 @@ module Selenium
           @port = port
         end
 
+        def url
+          "http://#{@host}:#{@port}/hub"
+        end
+
         def connect(timeout = 20)
           Timeout.timeout(timeout) {
             loop do
               begin
-                return new_socket
+                return TCPSocket.new(@host, @port).close
               rescue Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError => e
                 $stderr.puts "#{self} caught #{e.message} for #{@host}:#{@port}" if $DEBUG
                 sleep 0.25
@@ -21,69 +27,6 @@ module Selenium
           }
         end
 
-        def new_socket
-          @socket = TCPSocket.new(@host, @port)
-          @socket.sync = true
-
-          @socket
-        end
-
-        def connected?
-          @socket && !@socket.closed?
-        end
-
-        def send_string(str)
-          str = <<-HTTP
-GET / HTTP/1.1
-Host: localhost
-Content-Length: #{str.length}
-
-#{str}
-HTTP
-          @socket.write str
-          @socket.flush
-        end
-
-        def quit
-          command = {'commandName' => 'quit', 'context' => ''}
-          send_string(command.to_json)
-        ensure
-          close
-        end
-
-        def close
-          @socket.close if connected?
-        end
-
-        def read_response
-          resp     = ""
-          received = ""
-
-          until resp.include?("\n\n")
-            received = @socket.recv 1
-            if received
-              resp += received
-            end
-          end
-
-          length         = Integer(resp.split(":").last.strip)
-          json_string    = ''
-          bytes_received = 0
-
-          until bytes_received == length
-            read_string = @socket.recv(length - bytes_received)
-
-            bytes_received += read_string.length
-            json_string << read_string
-          end
-
-          if json_string.empty?
-            raise Error::WebDriverError, "empty response from extension"
-          end
-
-          JSON.parse json_string
-        end
-
       end # ExtensionConnection
     end # Firefox
   end # WebDriver

data/firefox/src/rb/lib/selenium/webdriver/firefox/launcher.rb

@@ -3,12 +3,13 @@ require "fcntl"
 module Selenium
   module WebDriver
     module Firefox
+
+      # @private
       class Launcher
 
         attr_reader :binary, :connection
         SOCKET_LOCK_TIMEOUT = 45
 
-
         def initialize(binary, port = DEFAULT_PORT, profile = DEFAULT_PROFILE_NAME)
           @binary       = binary
           @port         = port.to_i
@@ -82,7 +83,6 @@ module Selenium
           end
 
           @profile.delete_extensions_cache
-
           @profile.port = @port
           @profile.add_webdriver_extension(true)
           @profile.update_user_prefs
@@ -111,7 +111,6 @@ module Selenium
             begin
               connection = ExtensionConnection.new(@host, @port)
               connection.connect(1)
-              connection.close
 
               connect
               return

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

@@ -36,7 +36,6 @@ module Selenium
         attr_accessor :port
 
         class << self
-
           def ini
             @ini ||= ProfilesIni.new
           end
@@ -44,9 +43,20 @@ module Selenium
           def from_name(name)
             ini[name]
           end
-
         end
 
+        #
+        # Create a new Profile instance
+        #
+        # @example User configured profile
+        #
+        #   profile = Selenium::WebDriver::Firefox::Profile.new
+        #   profile['network.proxy.http'] = 'localhost'
+        #   profile['network.proxy.http_port'] = 9090
+        #
+        #   driver = Selenium::WebDriver.for :firefox, :profile => profile
+        #
+
         def initialize(directory = nil)
           @directory = directory ? create_tmp_copy(directory) : Dir.mktmpdir("webdriver-profile")
 
@@ -60,6 +70,30 @@ module Selenium
           @native_events     = DEFAULT_ENABLE_NATIVE_EVENTS
           @secure_ssl        = DEFAULT_SECURE_SSL
           @load_no_focus_lib = DEFAULT_LOAD_NO_FOCUS_LIB
+
+          @additional_prefs  = {}
+        end
+
+        #
+        # Set a preference for this particular profile.
+        # @see http://preferential.mozdev.org/preferences.html
+        #
+
+        def []=(key, value)
+          case value
+          when String
+            if Util.stringified?(value)
+              raise ArgumentError, "preference values must be plain strings: #{key.inspect} => #{value.inspect}"
+            end
+
+            value = %{"#{value}"}
+          when TrueClass, FalseClass, Integer, Float
+            value = value.to_s
+          else
+            raise TypeError, "invalid preference: #{value.inspect}:#{value.class}"
+          end
+
+          @additional_prefs[key.to_s] = value
         end
 
         def absolute_path
@@ -71,10 +105,16 @@ module Selenium
         end
 
         def update_user_prefs
-          prefs = current_user_prefs.merge DEFAULT_PREFERENCES
-          prefs['webdriver_firefox_port'] = @port
+          prefs = current_user_prefs
+
+          prefs.merge! OVERRIDABLE_PREFERENCES
+          prefs.merge! @additional_prefs
+          prefs.merge! DEFAULT_PREFERENCES
+
+          prefs['webdriver_firefox_port']           = @port
           prefs['webdriver_accept_untrusted_certs'] = 'true' unless secure_ssl?
-          prefs['webdriver_enable_native_events'] = 'true' if native_events?
+          prefs['webdriver_enable_native_events']   = 'true' if native_events?
+          prefs["startup.homepage_welcome_url"]     = prefs["browser.startup.homepage"] # If the user sets the home page, we should also start up there
 
           write_prefs prefs
         end
@@ -126,7 +166,7 @@ module Selenium
         end
 
         def user_prefs_path
-          @user_prefs_js ||= File.join(directory, "user.js")
+          @user_prefs_path ||= File.join(directory, "user.js")
         end
 
         def delete_extensions_cache
@@ -188,11 +228,17 @@ module Selenium
         def write_prefs(prefs)
           File.open(user_prefs_path, "w") do |file|
             prefs.each do |key, value|
-              file.puts "user_pref(#{key.inspect}, #{value});"
+              p key => value if $DEBUG
+              file.puts %{user_pref("#{key}", #{value});}
             end
           end
         end
 
+        OVERRIDABLE_PREFERENCES = {
+          "browser.startup.page"     => '0',
+          "browser.startup.homepage" => '"about:blank"'
+        }.freeze
+
         DEFAULT_PREFERENCES = {
           "app.update.auto"                           => 'false',
           "app.update.enabled"                        => 'false',
@@ -205,7 +251,6 @@ module Selenium
           "browser.search.update"                     => 'false',
           "browser.sessionstore.resume_from_crash"    => 'false',
           "browser.shell.checkDefaultBrowser"         => 'false',
-          "browser.startup.page"                      => '0',
           "browser.tabs.warnOnClose"                  => 'false',
           "browser.tabs.warnOnOpen"                   => 'false',
           "dom.disable_open_during_load"              => 'false',
@@ -222,10 +267,9 @@ module Selenium
           "security.warn_viewing_mixed"               => 'false',
           "security.warn_viewing_mixed.show_once"     => 'false',
           "signon.rememberSignons"                    => 'false',
-          "startup.homepage_welcome_url"              => '"about:blank"',
           "javascript.options.showInConsole"          => 'true',
           "browser.dom.window.dump.enabled"           => 'true'
-        }
+        }.freeze
 
       end # Profile
     end # Firefox

data/firefox/src/rb/lib/selenium/webdriver/firefox/profiles_ini.rb

@@ -1,6 +1,8 @@
 module Selenium
   module WebDriver
     module Firefox
+
+      # @private
       class ProfilesIni
 
         def initialize

data/firefox/src/rb/lib/selenium/webdriver/firefox/util.rb

@@ -1,6 +1,8 @@
 module Selenium
   module WebDriver
     module Firefox
+
+      # @private
       module Util
         module_function
 
@@ -17,6 +19,10 @@ module Selenium
           end
         end
 
+        def stringified?(str)
+          str =~ /^".*"$/
+        end
+
       end # Util
     end # Firefox
   end # WebDriver

data/jobbie/src/rb/lib/selenium/webdriver/ie.rb

@@ -1,5 +1,7 @@
 module Selenium
   module WebDriver
+
+    # @private
     module IE
       # TODO: x64
       DLL = "#{WebDriver.root}/jobbie/prebuilt/Win32/Release/InternetExplorerDriver.dll"

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

@@ -2,6 +2,10 @@ module Selenium
   module WebDriver
     module IE
 
+      #
+      # @private
+      #
+
       class Bridge
         include Util
 
@@ -335,7 +339,7 @@ module Selenium
 
         def getElementAttribute(element_pointer, name)
           create_string do |string_pointer|
-            check_error_code Lib.wdeGetAttribute(element_pointer, wstring_ptr(name), string_pointer),
+            check_error_code Lib.wdeGetAttribute(@driver_pointer, element_pointer, wstring_ptr(name), string_pointer),
                              "unable to get attribute #{name.inspect}"
           end
         end
@@ -506,48 +510,69 @@ module Selenium
           script_result    = pointer_ref.get_pointer(0)
 
           pointers_to_free << type_pointer = FFI::MemoryPointer.new(:int)
-          result       = Lib.wdGetScriptResultType(script_result, type_pointer)
+          result       = Lib.wdGetScriptResultType(@driver_pointer, script_result, type_pointer)
 
           check_error_code result, "Cannot determine result type"
+          result_type = type_pointer.get_int(0)
 
-          case type_pointer.get_int(0)
-          when 1
+          case result_type
+          when 1 # String
             create_string do |wrapper|
               check_error_code Lib.wdGetStringScriptResult(script_result, wrapper), "Cannot extract string result"
             end
-          when 2
+          when 2 # Long
             pointers_to_free << long_pointer = FFI::MemoryPointer.new(:long)
             check_error_code Lib.wdGetNumberScriptResult(script_result, long_pointer),
                              "Cannot extract number result"
 
             long_pointer.get_long(0)
-          when 3
+          when 3 # Boolean
             pointers_to_free << int_pointer = FFI::MemoryPointer.new(:int)
             check_error_code Lib.wdGetBooleanScriptResult(script_result, int_pointer),
                              "Cannot extract boolean result"
 
             int_pointer.get_int(0) == 1
-          when 4
-            element_pointer = FFI::MemoryPointer.new(:pointer)
+          when 4 # WebElement
+            pointers_to_free << element_pointer = FFI::MemoryPointer.new(:pointer)
             check_error_code Lib.wdGetElementScriptResult(script_result, @driver_pointer, element_pointer),
                              "Cannot extract element result"
 
             Element.new(self, element_pointer.get_pointer(0))
-          when 5
+          when 5 # Nothing
             nil
-          when 6
+          when 6 # Exception
             message = create_string do |string_pointer|
               check_error_code Lib.wdGetStringScriptResult(script_result, string_pointer), "Cannot extract string result"
             end
 
-            raise WebDriverError, message
-          when 7
+            raise Error::WebDriverError, message
+          when 7 # Double
             pointers_to_free << double_pointer = FFI::MemoryPointer.new(:double)
             check_error_code Lib.wdGetDoubleScriptResult(script_result, double_pointer), "Cannot extract double result"
 
             double_pointer.get_double(0)
+          when 8 # Array
+            pointers_to_free << array_length_pointer = FFI::MemoryPointer.new(:int)
+            check_error_code Lib.wdGetArrayLengthScriptResult(@driver_pointer, script_result, array_length_pointer),
+                             "Cannot extract array length"
+
+            arr = []
+            array_length_pointer.get_int(0).times do |idx|
+              current_item_pointer = FFI::MemoryPointer.new(:pointer)
+              result_code = Lib.wdGetArrayItemFromScriptResult(@driver_pointer, script_result, idx, current_item_pointer)
+
+              # free the pointer if the call failed
+              if Error.for_code(result_code)
+                Lib.wdFreeScriptResult(current_item_pointer.get_pointer(0))
+                check_error_code result_code
+              end
+
+              arr << extract_return_value(current_item_pointer)
+            end
+
+            arr
           else
-            raise WebDriverError, "Cannot determine result type"
+            raise Error::WebDriverError, "Cannot determine result type (#{result_type.inspect})"
           end
         ensure
           Lib.wdFreeScriptResult(script_result) if script_result

data/jobbie/src/rb/lib/selenium/webdriver/ie/lib.rb

@@ -1,6 +1,11 @@
 module Selenium
   module WebDriver
     module IE
+
+      #
+      # @private
+      #
+
       module Lib
         extend FFI::Library
 
@@ -20,7 +25,7 @@ module Selenium
         attach_function :wdCopyString,                        [:pointer, :int, :pointer                                   ], :int
         attach_function :wdeClear,                            [:pointer                                                   ], :int
         attach_function :wdeClick,                            [:pointer                                                   ], :int
-        attach_function :wdeGetAttribute,                     [:pointer, :pointer, :pointer                               ], :int
+        attach_function :wdeGetAttribute,                     [:pointer, :pointer, :pointer, :pointer                     ], :int
         attach_function :wdeGetDetailsOnceScrolledOnToScreen, [:pointer, :pointer, :pointer, :pointer, :pointer, :pointer ], :int
         attach_function :wdeGetLocation,                      [:pointer, :pointer, :pointer                               ], :int
         attach_function :wdeGetSize,                          [:pointer, :pointer, :pointer                               ], :int
@@ -60,6 +65,8 @@ module Selenium
         attach_function :wdFreeString,                        [:pointer                                                   ], :int
         attach_function :wdFreeStringCollection,              [:pointer                                                   ], :int
         attach_function :wdGet,                               [:pointer, :pointer                                         ], :int
+        attach_function :wdGetArrayLengthScriptResult,        [:pointer, :pointer, :pointer                               ], :int
+        attach_function :wdGetArrayItemFromScriptResult,      [:pointer, :pointer, :int, :pointer                         ], :int
         attach_function :wdGetAllWindowHandles,               [:pointer, :pointer                                         ], :int
         attach_function :wdGetBooleanScriptResult,            [:pointer, :pointer                                         ], :int
         attach_function :wdGetCookies,                        [:pointer, :pointer                                         ], :int
@@ -69,7 +76,7 @@ module Selenium
         attach_function :wdGetElementScriptResult,            [:pointer, :pointer, :pointer                               ], :int
         attach_function :wdGetNumberScriptResult,             [:pointer, :pointer                                         ], :int
         attach_function :wdGetPageSource,                     [:pointer, :pointer                                         ], :int
-        attach_function :wdGetScriptResultType,               [:pointer, :pointer                                         ], :int
+        attach_function :wdGetScriptResultType,               [:pointer, :pointer, :pointer                               ], :int
         attach_function :wdGetStringScriptResult,             [:pointer, :pointer                                         ], :int
         attach_function :wdGetTitle,                          [:pointer, :pointer                                         ], :int
         attach_function :wdGetVisible,                        [:pointer, :pointer                                         ], :int

data/jobbie/src/rb/lib/selenium/webdriver/ie/util.rb

@@ -1,6 +1,11 @@
 module Selenium
   module WebDriver
     module IE
+
+      #
+      # @private
+      #
+
       module Util
         CP_ACP         = 0
         CP_OEMCP       = 1

data/remote/client/src/rb/lib/selenium/webdriver/remote.rb

@@ -7,6 +7,8 @@ require "selenium/webdriver/remote/commands"
 
 module Selenium
   module WebDriver
+
+    # @private
     module Remote
 
     end