selenium-webdriver 0.0.14 → 0.0.15

data/firefox/src/extension/components/screenshooter.js

@@ -37,7 +37,7 @@ Screenshooter.grab = function(window) {
   canvas.width = width;
   canvas.height = height;
   var context = canvas.getContext('2d');
-  context.drawWindow(window, 0, 0, width, height, 'rgb(0,0,0)');
+  context.drawWindow(window, 0, 0, width, height, 'rgb(255,255,255)');
   return canvas;
 };
 

data/firefox/src/extension/components/utils.js

@@ -154,7 +154,7 @@ function getTextFromNode(node, toReturn, textSoFar) {
 
     // Or is this just plain text?
     if (child.nodeName == "#text") {
-      if (Utils.isDisplayed(child)) {
+      if (Utils.isDisplayed(child, false)) {
         var textToAdd = child.nodeValue;
         textToAdd =
         textToAdd.replace(new RegExp(String.fromCharCode(160), "gm"), " ");
@@ -211,7 +211,10 @@ Utils.isInHead = function(element) {
 };
 
 
-Utils.isDisplayed = function(element) {
+/**
+ * Checks that the element is not hidden by dimensions or CSS
+ */
+Utils.isDisplayed = function(element, scrollIfNecessary) {
   // Ensure that we're dealing with an element.
   var el = element;
   while (el.nodeType != 1 && !(el.nodeType >= 9 && el.nodeType <= 11)) {
@@ -227,7 +230,7 @@ Utils.isDisplayed = function(element) {
     return false;
   }
 
-  var box = Utils.getLocationOnceScrolledIntoView(el);
+  var box = scrollIfNecessary ? Utils.getLocationOnceScrolledIntoView(el) : Utils.getLocation(el);
   // Elements with zero width or height are never displayed
   if (box.width == 0 || box.height == 0) {
     return false;
@@ -427,6 +430,7 @@ Utils.type = function(context, element, text, opt_useNativeEvents) {
     var inputtype = element.getAttribute("type");
     if (inputtype && inputtype.toLowerCase() == "file") {
       element.value = text;
+      Utils.fireHtmlEvent(context, element, "change");
       return;
     }
   }
@@ -1085,13 +1089,7 @@ Utils.findElementsByXPath = function (xpath, contextNode, context) {
 };
 
 
-Utils.getLocationOnceScrolledIntoView = function(element) {
-  // Some elements may not a scrollIntoView function - for example,
-  // elements under an SVG element. Call those only if they exist.
-  if (typeof element.scrollIntoView == 'function') {
-    element.scrollIntoView(true);
-  }
-
+Utils.getLocation = function(element) {
   var retrieval = Utils.newInstance(
       "@mozilla.org/accessibleRetrieval;1", "nsIAccessibleRetrieval");
 
@@ -1175,6 +1173,17 @@ Utils.getLocationOnceScrolledIntoView = function(element) {
 };
 
 
+Utils.getLocationOnceScrolledIntoView = function(element) {
+  // Some elements may not a scrollIntoView function - for example,
+  // elements under an SVG element. Call those only if they exist.
+  if (typeof element.scrollIntoView == 'function') {
+    element.scrollIntoView(true);
+  }
+
+  return Utils.getLocation(element);
+};
+
+
 Utils.unwrapParameters = function(wrappedParameters, resultArray, context) {
   while (wrappedParameters && wrappedParameters.length > 0) {
     var t = wrappedParameters.shift();

data/firefox/src/extension/components/wrappedElement.js

@@ -20,7 +20,7 @@
 FirefoxDriver.prototype.click = function(respond) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
-  if (!Utils.isDisplayed(element) && !Utils.isInHead(element)) {
+  if (!Utils.isDisplayed(element, true) && !Utils.isInHead(element)) {
     respond.isError = true;
     respond.response =
     "Element is not currently visible and so may not be clicked";
@@ -164,7 +164,7 @@ FirefoxDriver.prototype.getValue = function(respond) {
 FirefoxDriver.prototype.sendKeys = function(respond, value) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
-  if (!Utils.isDisplayed(element) && !Utils.isInHead(element)) {
+  if (!Utils.isDisplayed(element, true) && !Utils.isInHead(element)) {
     respond.isError = true;
     respond.response =
     "Element is not currently visible and so may not be used for typing";
@@ -198,7 +198,7 @@ FirefoxDriver.prototype.sendKeys = function(respond, value) {
 FirefoxDriver.prototype.clear = function(respond) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
-  if (!Utils.isDisplayed(element) && !Utils.isInHead(element)) {
+  if (!Utils.isDisplayed(element, true) && !Utils.isInHead(element)) {
     respond.isError = true;
     respond.response =
     "Element is not currently visible and so may not be cleared";
@@ -322,7 +322,7 @@ FirefoxDriver.prototype.submit = function(respond) {
     while (element.parentNode != null && element.tagName.toLowerCase() != "form") {
       element = element.parentNode;
     }
-    if (element.tagName.toLowerCase() == "form") {
+    if (element.tagName && element.tagName.toLowerCase() == "form") {
       if (Utils.fireHtmlEvent(respond.context, element, "submit")) {
         new WebLoadingListener(Utils.getBrowser(respond.context), function() {
           respond.send();
@@ -375,7 +375,7 @@ FirefoxDriver.prototype.isSelected = function(respond) {
 FirefoxDriver.prototype.setSelected = function(respond) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
-  if (!Utils.isDisplayed(element) && !Utils.isInHead(element)) {
+  if (!Utils.isDisplayed(element, true) && !Utils.isInHead(element)) {
     respond.isError = true;
     respond.response =
     "Element is not currently visible and so may not be selected";
@@ -491,7 +491,7 @@ FirefoxDriver.prototype.toggle = function(respond) {
 
 FirefoxDriver.prototype.isDisplayed = function(respond) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
-  respond.response = Utils.isDisplayed(element);
+  respond.response = Utils.isDisplayed(element, false);
   respond.send();
 };
 
@@ -525,7 +525,7 @@ FirefoxDriver.prototype.getSize = function(respond) {
 FirefoxDriver.prototype.dragElement = function(respond, movementString) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
-  if (!Utils.isDisplayed(element) && !Utils.isInHead(element)) {
+  if (!Utils.isDisplayed(element, true) && !Utils.isInHead(element)) {
     respond.isError = true;
     respond.response =
     "Element is not currently visible and so may not be used for drag and drop";
@@ -601,7 +601,7 @@ FirefoxDriver.prototype.getValueOfCssProperty = function(respond,
 FirefoxDriver.prototype.getLocationOnceScrolledIntoView = function(respond) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
-  if (!Utils.isDisplayed(element)) {
+  if (!Utils.isDisplayed(element, true)) {
     respond.response = undefined;
     respond.send();
     return;

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

@@ -15,8 +15,15 @@ module Selenium
 
        DEFAULT_PROFILE_NAME         = "WebDriver".freeze
        DEFAULT_PORT                 = 7055
-       DEFAULT_ENABLE_NATIVE_EVENTS = Platform.win?
+       DEFAULT_ENABLE_NATIVE_EVENTS = [:windows, :linux].include? Platform.os
 
     end
   end
+end
+
+
+# SocketError was added in Ruby 1.8.7.
+# If it's not defined, we add it here so it can be used in rescues.
+unless defined? SocketError
+  class SocketError < IOError; end
 end

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

@@ -87,7 +87,7 @@ module Selenium
         end
 
         def windows_registry_path
-          return if Platform.jruby?
+          return if Platform.jruby? || Platform.ironruby?
           require "win32/registry"
 
           lm = Win32::Registry::HKEY_LOCAL_MACHINE

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

@@ -151,6 +151,14 @@ module Selenium
           find_elements_by 'xpath', xpath, parent
         end
 
+        def findElementByCssSelector(parent, selector)
+          find_element_by 'css selector', selector, parent
+        end
+
+        def findElementsByCssSelector(parent, selector)
+          find_elements_by 'css selector', selector, parent
+        end
+
         #
         # Element functions
         #
@@ -327,6 +335,10 @@ module Selenium
                   :parameters => [name.to_s]
         end
 
+        def switchToDefaultContent
+          execute :switchToDefaultContent
+        end
+
         def switchToWindow(name)
           @context = execute  :switchToWindow,
                               :parameters => [name.to_s]

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

@@ -13,7 +13,7 @@ module Selenium
             loop do
               begin
                 return new_socket
-              rescue Errno::ECONNREFUSED, Errno::ENOTCONN => e
+              rescue Errno::ECONNREFUSED, Errno::ENOTCONN, SocketError => e
                 $stderr.puts "#{self} caught #{e.message} for #{@host}:#{@port}" if $DEBUG
                 sleep 0.25
               end

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

@@ -1,3 +1,5 @@
+require "fcntl"
+
 module Selenium
   module WebDriver
     module Firefox
@@ -29,6 +31,8 @@ module Selenium
 
         def with_lock
           socket_lock = TCPServer.new(@host, @port - 1)
+          socket_lock.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC) if defined? Fcntl::FD_CLOEXEC
+
           yield
         ensure
           socket_lock.close if socket_lock

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

@@ -16,14 +16,15 @@ module Selenium
           ["#{WebDriver.root}/firefox/prebuilt/nsIResponseHandler.xpt", "components/nsIResponseHandler.xpt"],
         ]
 
-        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"]
-        }
+        NATIVE_WINDOWS = ["#{WebDriver.root}/firefox/prebuilt/Win32/Release/webdriver-firefox.dll", "platform/WINNT_x86-msvc/components/webdriver-firefox.dll"]
+        NATIVE_LINUX   = [
+          ["#{WebDriver.root}/firefox/prebuilt/linux/Release/libwebdriver-firefox.so", "platform/Linux_x86-gcc3/components/libwebdriver-firefox.so"],
+          ["#{WebDriver.root}/firefox/prebuilt/linux64/Release/libwebdriver-firefox.so", "platform/Linux_x86_64-gcc3/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"],
+          ["#{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 = [
@@ -90,13 +91,21 @@ module Selenium
           from_to = XPTS + SHARED
 
           if native_events?
-            from_to << (NATIVE[Platform.os] || raise(Error::WebDriverError,
-                                                        "can't enable native events on #{Platform.os.inspect}"))
+            case Platform.os
+            when :linux
+              NATIVE_LINUX.each do |lib|
+                from_to << lib
+              end
+            when :windows
+              from_to << NATIVE_WINDOWS
+            else
+              raise Error::WebDriverError, "can't enable native events on #{Platform.os.inspect}"
+            end
           end
 
           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) })
+            modify_link_library_path(NO_FOCUS.map { |source, dest| File.join(ext_path, File.dirname(dest)) })
           end
 
           from_to.each do |source, destination|

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

@@ -90,6 +90,10 @@ module Selenium
           end
         end
 
+        def switchToDefaultContent
+          switchToFrame ""
+        end
+
         def quit
           getWindowHandles.each do |handle|
             begin

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

@@ -62,6 +62,7 @@ module Selenium
 
         def extract_string_from(string_ptr_ref)
           string_ptr = string_ptr_ref.get_pointer(0)
+          return if string_ptr.null? # getElementAttribute()
 
           length_ptr = FFI::MemoryPointer.new :int
 
@@ -78,7 +79,7 @@ module Selenium
 
           wstring_to_bytestring raw_string
         ensure
-          Lib.wdFreeString(string_ptr)
+          Lib.wdFreeString(string_ptr) unless string_ptr.null?
           string_ptr_ref.free
         end
 
@@ -87,7 +88,7 @@ module Selenium
           length_ptr   = FFI::MemoryPointer.new :int
 
           check_error_code Lib.wdcGetElementCollectionLength(elements_ptr, length_ptr),
-          "Cannot extract elements from collection"
+                           "Cannot extract elements from collection"
 
           arr = []
 

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

@@ -131,6 +131,10 @@ module Selenium
           execute :switchToFrame, :id => id
         end
 
+        def switchToDefaultContent
+          execute :switchToFrame, :id => nil
+        end
+
         def quit
           execute :quit
         end

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

@@ -56,7 +56,7 @@ module Selenium
           if res.content_type == CONTENT_TYPE
             Response.new do |r|
               r.code         = res.code.to_i
-              r.payload      = JSON.parse(res.body)
+              r.payload      = JSON.parse(res.body.strip)
             end
           elsif res.code == '204'
             Response.new { |r| r.code = res.code.to_i }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +01:00
+date: 2010-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,6 +111,7 @@ files:
 - 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/rpc-optimizing-user-extension.js
 - common/src/js/core/scripts/selenium-api.js
 - common/src/js/core/scripts/selenium-browserbot.js
 - common/src/js/core/scripts/selenium-browserdetect.js