selenium-webdriver 0.0.9 → 0.0.10

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

@@ -23,12 +23,6 @@ module Selenium
 
         def start_with(profile, *args)
           ENV['XRE_PROFILE_PATH'] = profile.absolute_path
-
-          # TODO: native lib loading
-          # if Platform.os == :unix && (profile.enable_native_events || profile.always_load_no_focus_lib)
-          #   modify_link_library_path profile
-          # end
-
           execute(*args)
           cope_with_mac_strangeness(args) if Platform.mac?
         end
@@ -74,7 +68,7 @@ module Selenium
                               "/Applications/Firefox.app/Contents/MacOS/firefox-bin"
                             when :windows
                               windows_path
-                            when :unix
+                            when :linux, :unix
                               "/usr/bin/firefox"
                             else
                               raise "Unknown platform: #{Platform.os}"

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

@@ -35,6 +35,10 @@ module Selenium
           execute :getPageSource
         end
 
+        def refresh
+          execute :refresh
+        end
+
         def getWindowHandles
           execute :getWindowHandles
         end
@@ -181,13 +185,16 @@ module Selenium
           # data = execute :getElementLocation, :element_id => element
           data = execute :getLocation,
                          :element_id => element
-          Point.new(data["x"], data["y"])
+
+          Point.new data["x"], data["y"]
         end
 
         def getElementSize(element)
           # execute :getElementSize, :element_id => element
-          execute :getSize,
-                  :element_id => element
+          data = execute :getSize,
+                         :element_id => element
+
+          Dimension.new data['width'], data['height']
         end
 
         def sendKeysToElement(element, string)
@@ -245,7 +252,7 @@ module Selenium
                   :parameters => [prop]
         end
 
-        def hoverOverElement
+        def hoverOverElement(element)
           execute :hover,
                   :element_id => element
           # execute :hoverOverElement, :element_id => element

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

@@ -6,22 +6,32 @@ module Selenium
         ANONYMOUS_PROFILE_NAME = "WEBDRIVER_ANONYMOUS_PROFILE"
         EXTENSION_NAME         = "fxdriver@googlecode.com"
         EM_NAMESPACE_URI       = "http://www.mozilla.org/2004/em-rdf#"
+        NO_FOCUS_LIBRARY_NAME  = "x_ignore_nofocus.so"
 
-        # TODO: hardcoded paths
         DEFAULT_EXTENSION_SOURCE = File.expand_path("#{WebDriver.root}/firefox/src/extension")
 
-        XPTS                     = {
-          "#{WebDriver.root}/firefox/prebuilt/nsINativeEvents.xpt"     => "components/nsINativeEvents.xpt",
-          "#{WebDriver.root}/firefox/prebuilt/nsICommandProcessor.xpt" => "components/nsICommandProcessor.xpt",
-          "#{WebDriver.root}/firefox/prebuilt/nsIResponseHandler.xpt"  => "components/nsIResponseHandler.xpt"
-        }
+        XPTS = [
+          ["#{WebDriver.root}/firefox/prebuilt/nsINativeEvents.xpt", "components/nsINativeEvents.xpt"],
+          ["#{WebDriver.root}/firefox/prebuilt/nsICommandProcessor.xpt", "components/nsICommandProcessor.xpt"],
+          ["#{WebDriver.root}/firefox/prebuilt/nsIResponseHandler.xpt", "components/nsIResponseHandler.xpt"],
+        ]
 
-        SHARED = {
-          "#{WebDriver.root}/common/src/js/extension/dommessenger.js" => "content/dommessenger.js"
+        NATIVE = {
+          :windows => ["#{WebDriver.root}/firefox/prebuilt/Win32/Release/webdriver-firefox.dll", "platform/WINNT_x86-msvc/components/webdriver-firefox.dll"],
+          :linux   => ["#{WebDriver.root}/firefox/prebuilt/linux64/Release/libwebdriver-firefox.so", "platform/Linux/components/libwebdriver-firefox.so"]
         }
 
+        NO_FOCUS = [
+          ["#{WebDriver.root}/firefox/prebuilt/linux64/Release/x_ignore_nofocus.so"    , "amd64/x_ignore_nofocus.so"],
+          ["#{WebDriver.root}/firefox/prebuilt/linux/Release/x_ignore_nofocus.so"      , "x86/x_ignore_nofocus.so"],
+        ]
+
+        SHARED = [
+          ["#{WebDriver.root}/common/src/js/extension/dommessenger.js", "content/dommessenger.js"]
+        ]
+
         attr_reader :name, :directory
-        attr_accessor :port, :secure_ssl
+        attr_accessor :port, :secure_ssl, :native_events, :load_no_focus_lib
 
         class << self
 
@@ -60,7 +70,8 @@ module Selenium
         def update_user_prefs
           prefs = existing_user_prefs.merge DEFAULT_PREFERENCES
           prefs['webdriver.firefox_port'] = @port
-          prefs['webdriver_accept_untrusted_certs'] = "true" unless @secure_ssl == true
+          prefs['webdriver_accept_untrusted_certs'] = 'true' unless @secure_ssl == true
+          prefs['webdriver_enable_native_events'] = 'true' if native_events?
 
           write_prefs prefs
         end
@@ -76,12 +87,22 @@ module Selenium
           FileUtils.mkdir_p File.dirname(ext_path), :mode => 0700
           FileUtils.cp_r @extension_source, ext_path
 
-          XPTS.each do |source, destination|
-            FileUtils.cp source, File.join(ext_path, destination)
+          from_to = XPTS + SHARED
+
+          if native_events?
+            from_to << (NATIVE[Platform.os] || raise(Error::WebDriverError,
+                                                        "can't enable native events on #{Platform.os.inspect}"))
           end
 
-          SHARED.each do |source, destination|
-            FileUtils.cp source, File.join(ext_path, destination)
+          if Platform.os == :linux || load_no_focus_lib?
+            from_to += NO_FOCUS
+            modify_link_library_path(NO_FOCUS.map { |source, dest| File.join(ext_path, dest) })
+          end
+
+          from_to.each do |source, destination|
+            dest = File.join(ext_path, destination)
+            FileUtils.mkdir_p File.dirname(dest)
+            FileUtils.cp source, dest
           end
 
           delete_extensions_cache
@@ -111,10 +132,30 @@ module Selenium
         end
 
         def delete_extensions_cache
-          cache = File.join(@directory, "extensions.cache")
+          cache = File.join(directory, "extensions.cache")
           FileUtils.rm_f cache if File.exist?(cache)
         end
 
+        def modify_link_library_path(paths)
+          old_path = ENV['LD_LIBRARY_PATH']
+
+          unless [nil, ''].include?(old_path)
+            paths << old_path
+          end
+
+          ENV['LD_LIBRARY_PATH'] = paths.join(File::PATH_SEPARATOR)
+          ENV['LD_PRELOAD']      = NO_FOCUS_LIBRARY_NAME
+        end
+
+        def native_events?
+          !!(@native_events ||= Firefox::DEFAULT_ENABLE_NATIVE_EVENTS)
+        end
+
+        def load_no_focus_lib?
+          !!(@load_no_focus_lib ||= false)
+        end
+
+
         private
 
         def existing_user_prefs

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

@@ -10,7 +10,7 @@ module Selenium
             "#{ENV['APPDATA']}\\Mozilla\\Firefox"
           when :macosx
             "#{Platform.home}/Library/Application Support/Firefox"
-          when :unix
+          when :unix, :linux
             "#{Platform.home}/.mozilla/firefox"
           else
             raise "Unknown os: #{Platform.os}"

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

@@ -92,8 +92,11 @@ module Selenium
 
         def quit
           getWindowHandles.each do |handle|
-            switch_to_window handle rescue nil # TODO: rescue specific exceptions
-            close
+            begin
+              switchToWindow handle
+              close
+            rescue Error::NoSuchWindowError
+            end
           end
 
           # hack
@@ -107,6 +110,10 @@ module Selenium
           check_error_code Lib.wdClose(@driver_pointer), "Unable to close driver"
         end
 
+        def refresh
+          raise Error::UnsupportedOperationError
+        end
+
         def getWindowHandles
           raw_handles = FFI::MemoryPointer.new :pointer
           check_error_code Lib.wdGetAllWindowHandles(@driver_pointer, raw_handles),
@@ -167,8 +174,6 @@ module Selenium
             check_error_code Lib.wdGetCookies(@driver_pointer, wrapper), "Unable to get cookies"
           end
 
-          p :cookie_string => str
-
           str.split("; ").map do |cookie_string|
             parts = cookie_string.split("=")
             next unless parts.size == 2
@@ -412,7 +417,7 @@ module Selenium
           end
         end
 
-        def hoverOverElement
+        def hoverOverElement(element_pointer)
           raise NotImplementedError
         end
 

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

@@ -12,12 +12,11 @@ module Selenium
 
         def string_array_from(raw_strings)
           strings_ptr = raw_strings.get_pointer(0)
-
-          length_ptr = FFI::MemoryPointer.new :int
-          result     = Lib.wdcGetStringCollectionLength(strings_ptr, length_ptr)
+          length_ptr  = FFI::MemoryPointer.new :int
+          result      = Lib.wdcGetStringCollectionLength(strings_ptr, length_ptr)
 
           if result != 0
-            raise "Cannot extract strings from collection, error code: #{result.inspect}"
+            raise Error::WebDriverError, "cannot extract strings from collection, error code: #{result.inspect}"
           end
 
           arr    = []
@@ -27,7 +26,7 @@ module Selenium
             result = Lib.wdcGetStringAtIndex(strings_ptr, idx, str_ptr_ref)
 
             if result != 0
-              raise "Unable to get string at index: #{idx}, error: #{result}"
+              raise Error::WebDriverError, "unable to get string at index: #{idx}, error: #{result}"
             end
 
             arr << extract_string_from(str_ptr_ref)
@@ -67,16 +66,16 @@ module Selenium
           length_ptr = FFI::MemoryPointer.new :int
 
           if Lib.wdStringLength(string_ptr, length_ptr) != 0
-            raise "Cannot determine length of string"
+            raise Error::WebDriverError, "cannot determine length of string"
           end
 
           length     = length_ptr.get_int(0)
           raw_string = wstring_ptr(" "*length)
 
           if Lib.wdCopyString(string_ptr, length, raw_string) != 0
-            raise "Cannot copy string from native data to Ruby string"
+            raise Error::WebDriverError, "cannot copy string from native data to Ruby string"
           end
-          #
+
           wstring_to_bytestring raw_string
         ensure
           Lib.wdFreeString(string_ptr)
@@ -117,7 +116,7 @@ module Selenium
           size = Kernel32.MultiByteToWideChar(CP_UTF8, 0, str, -1, nil, 0)
 
           unless size > 0
-            raise "Could not convert #{str.inspect} to wchar ptr"
+            raise Error::WebDriverError, "could not convert #{str.inspect} to wchar ptr"
           end
 
           buf = FFI::MemoryPointer.new :pointer, size
@@ -130,7 +129,7 @@ module Selenium
           size = Kernel32.WideCharToMultiByte(CP_UTF8, 0, wstring, -1, nil, 0, nil, nil)
 
           unless size > 0
-            raise "Could not convert wstring pointer to bytestring"
+            raise Error::WebDriverError, "could not convert wstring pointer to bytestring"
           end
 
           buf = FFI::MemoryPointer.new :pointer, size

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

@@ -260,7 +260,9 @@ module Selenium
         end
 
         def getElementSize(element)
-          execute :getElementSize, :id => element
+          data = execute :getElementSize, :id => element
+
+          Dimension.new data['width'], data['height']
         end
 
         def sendKeysToElement(element, string)
@@ -304,7 +306,7 @@ module Selenium
         end
         alias_method :switchToActiveElement, :getActiveElement
 
-        def hoverOverElement
+        def hoverOverElement(element)
           execute :hoverOverElement, :id => element
         end
 

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

@@ -6,14 +6,6 @@ module Selenium
       # Specification of the desired and/or actual capabilities of the browser that the
       # server is being asked to create.
       #
-      # @option browser_name        [String] required browser name
-      # @option version             [String] required browser version number
-      # @option platform            [Symbol] one of :any, :win, :mac, or :x
-      # @option javascript_enabled  [Boolean] should the test run with javascript enabled?
-      #
-      # @api public
-      #
-
       class Capabilities
 
         attr_accessor :browser_name, :version, :platform, :javascript_enabled
@@ -64,8 +56,29 @@ module Selenium
               :javascript_enabled => true
             }.merge(opts))
           end
+
+          #
+          # @api private
+          #
+
+          def json_create(data)
+            new(
+              :browser_name       => data["browserName"],
+              :version            => data["version"],
+              :platform           => data["platform"].downcase.to_sym,
+              :javascript_enabled => data["javascriptEnabled"]
+            )
+          end
         end
 
+        # @option browser_name        [String] required browser name
+        # @option version             [String] required browser version number
+        # @option platform            [Symbol] one of :any, :win, :mac, or :x
+        # @option javascript_enabled  [Boolean] should the test run with javascript enabled?
+        #
+        # @api public
+        #
+
         def initialize(opts = {})
           @browser_name       = opts[:browser_name]       || ""
           @version            = opts[:version]            || ""
@@ -77,26 +90,13 @@ module Selenium
         # @api private
         #
 
-        def self.json_create(data)
-          new(
-            :browser_name       => data["browserName"],
-            :version            => data["version"],
-            :platform           => data["platform"].downcase.to_sym,
-            :javascript_enabled => data["javascriptEnabled"]
-          )
-        end
-
-        #
-        # @api private
-        #
-
-        def to_json
+        def to_json(*args)
           {
             "browserName"       => browser_name,
             "version"           => version,
             "platform"          => platform.to_s.upcase,
             "javascriptEnabled" => javascript?
-          }.to_json
+          }.to_json(*args)
         end
 
       end # Capabilities

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 +01:00
+date: 2009-12-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,15 +77,111 @@ files:
 - common/src/rb/lib/selenium/webdriver/target_locator.rb
 - common/src/rb/lib/selenium/webdriver.rb
 - common/src/rb/lib/selenium-webdriver.rb
+- common/src/rb/README
 - common/src/js/abstractcommandprocessor.js
 - common/src/js/asserts.js
 - common/src/js/by.js
 - common/src/js/command.js
 - common/src/js/context.js
+- common/src/js/core/Blank.html
+- common/src/js/core/icons/all.png
+- common/src/js/core/icons/continue.png
+- common/src/js/core/icons/continue_disabled.png
+- common/src/js/core/icons/pause.png
+- common/src/js/core/icons/pause_disabled.png
+- common/src/js/core/icons/selected.png
+- common/src/js/core/icons/step.png
+- common/src/js/core/icons/step_disabled.png
+- common/src/js/core/InjectedRemoteRunner.html
+- common/src/js/core/lib/cssQuery/cssQuery-p.js
+- common/src/js/core/lib/cssQuery/src/cssQuery-level2.js
+- common/src/js/core/lib/cssQuery/src/cssQuery-level3.js
+- common/src/js/core/lib/cssQuery/src/cssQuery-standard.js
+- common/src/js/core/lib/cssQuery/src/cssQuery.js
+- common/src/js/core/lib/prototype.js
+- common/src/js/core/lib/scriptaculous/builder.js
+- common/src/js/core/lib/scriptaculous/controls.js
+- common/src/js/core/lib/scriptaculous/dragdrop.js
+- common/src/js/core/lib/scriptaculous/effects.js
+- common/src/js/core/lib/scriptaculous/scriptaculous.js
+- common/src/js/core/lib/scriptaculous/slider.js
+- common/src/js/core/lib/scriptaculous/unittest.js
+- common/src/js/core/lib/snapsie.js
+- common/src/js/core/RemoteRunner.html
+- common/src/js/core/scripts/find_matching_child.js
+- common/src/js/core/scripts/htmlutils.js
+- common/src/js/core/scripts/injection.html
+- common/src/js/core/scripts/selenium-api.js
+- common/src/js/core/scripts/selenium-browserbot.js
+- common/src/js/core/scripts/selenium-browserdetect.js
+- common/src/js/core/scripts/selenium-commandhandlers.js
+- common/src/js/core/scripts/selenium-executionloop.js
+- common/src/js/core/scripts/selenium-logging.js
+- common/src/js/core/scripts/selenium-remoterunner.js
+- common/src/js/core/scripts/selenium-testrunner.js
+- common/src/js/core/scripts/selenium-version.js
+- common/src/js/core/scripts/ui-doc.html
+- common/src/js/core/scripts/ui-element.js
+- common/src/js/core/scripts/ui-map-sample.js
+- common/src/js/core/scripts/user-extensions.js
+- common/src/js/core/scripts/user-extensions.js.sample
+- common/src/js/core/scripts/xmlextras.js
+- common/src/js/core/selenium-logo.png
+- common/src/js/core/selenium-test.css
+- common/src/js/core/selenium.css
+- common/src/js/core/SeleniumLog.html
+- common/src/js/core/TestPrompt.html
+- common/src/js/core/TestRunner-splash.html
+- common/src/js/core/TestRunner.html
+- common/src/js/core/xpath/dom.js
+- common/src/js/core/xpath/javascript-xpath-0.1.11.js
+- common/src/js/core/xpath/util.js
+- common/src/js/core/xpath/xmltoken.js
+- common/src/js/core/xpath/xpath.js
 - common/src/js/extension/dommessenger.js
 - common/src/js/extension/README
 - common/src/js/factory.js
 - common/src/js/future.js
+- common/src/js/jsunit/app/css/jsUnitStyle.css
+- common/src/js/jsunit/app/css/readme
+- common/src/js/jsunit/app/emptyPage.html
+- common/src/js/jsunit/app/jsUnitCore.js
+- common/src/js/jsunit/app/jsUnitMockTimeout.js
+- common/src/js/jsunit/app/jsUnitTestManager.js
+- common/src/js/jsunit/app/jsUnitTestSuite.js
+- common/src/js/jsunit/app/jsUnitTracer.js
+- common/src/js/jsunit/app/jsUnitVersionCheck.js
+- common/src/js/jsunit/app/main-counts-errors.html
+- common/src/js/jsunit/app/main-counts-failures.html
+- common/src/js/jsunit/app/main-counts-runs.html
+- common/src/js/jsunit/app/main-counts.html
+- common/src/js/jsunit/app/main-data.html
+- common/src/js/jsunit/app/main-errors.html
+- common/src/js/jsunit/app/main-frame.html
+- common/src/js/jsunit/app/main-loader.html
+- common/src/js/jsunit/app/main-progress.html
+- common/src/js/jsunit/app/main-results.html
+- common/src/js/jsunit/app/main-status.html
+- common/src/js/jsunit/app/testContainer.html
+- common/src/js/jsunit/app/testContainerController.html
+- common/src/js/jsunit/app/xbDebug.js
+- common/src/js/jsunit/changelog.txt
+- common/src/js/jsunit/css/jsUnitStyle.css
+- common/src/js/jsunit/images/green.gif
+- common/src/js/jsunit/images/logo_jsunit.gif
+- common/src/js/jsunit/images/powerby-transparent.gif
+- common/src/js/jsunit/images/red.gif
+- common/src/js/jsunit/licenses/gpl-2.txt
+- common/src/js/jsunit/licenses/index.html
+- common/src/js/jsunit/licenses/JDOM_license.txt
+- common/src/js/jsunit/licenses/Jetty_license.html
+- common/src/js/jsunit/licenses/lgpl-2.1.txt
+- common/src/js/jsunit/licenses/MPL-1.1.txt
+- common/src/js/jsunit/licenses/mpl-tri-license-c.txt
+- common/src/js/jsunit/licenses/mpl-tri-license-html.txt
+- common/src/js/jsunit/readme.txt
+- common/src/js/jsunit/testRunner.html
+- common/src/js/jsunit/version.txt
 - common/src/js/jsunit.js
 - common/src/js/key.js
 - common/src/js/localcommandprocessor.js
@@ -121,9 +217,14 @@ files:
 - firefox/src/extension/idl/nsICommandProcessor.idl
 - firefox/src/extension/idl/nsIResponseHandler.idl
 - firefox/src/extension/install.rdf
+- firefox/prebuilt/linux/Release/libwebdriver-firefox.so
+- firefox/prebuilt/linux/Release/x_ignore_nofocus.so
+- firefox/prebuilt/linux64/Release/libwebdriver-firefox.so
+- firefox/prebuilt/linux64/Release/x_ignore_nofocus.so
 - firefox/prebuilt/nsICommandProcessor.xpt
 - firefox/prebuilt/nsINativeEvents.xpt
 - firefox/prebuilt/nsIResponseHandler.xpt
+- firefox/prebuilt/Win32/Release/webdriver-firefox.dll
 - chrome/src/rb/lib/selenium/webdriver/chrome/bridge.rb
 - chrome/src/rb/lib/selenium/webdriver/chrome/command_executor.rb
 - chrome/src/rb/lib/selenium/webdriver/chrome/launcher.rb
@@ -143,11 +244,7 @@ files:
 - jobbie/src/rb/lib/selenium/webdriver/ie/util.rb
 - jobbie/src/rb/lib/selenium/webdriver/ie.rb
 - jobbie/prebuilt/Win32/Release/InternetExplorerDriver.dll
-- jobbie/prebuilt/Win32/Release/webdriver-ie-test.dll
-- jobbie/prebuilt/Win32/Release/webdriver-ie.dll
 - jobbie/prebuilt/x64/Release/InternetExplorerDriver.dll
-- jobbie/prebuilt/x64/Release/webdriver-ie-test.dll
-- jobbie/prebuilt/x64/Release/webdriver-ie.dll
 - remote/client/src/rb/lib/selenium/webdriver/remote/bridge.rb
 - remote/client/src/rb/lib/selenium/webdriver/remote/capabilities.rb
 - remote/client/src/rb/lib/selenium/webdriver/remote/commands.rb