selenium-webdriver 0.0.13 → 0.0.14

data/chrome/src/extension/background.js

@@ -126,12 +126,9 @@ ChromeDriver.xmlHttpRequest = null;
 
 /**
  * URL to ping for commands.
- * TODO(danielwh): Get this from the initial URL - see http://crbug.com/11547,
- * the ChromeDriverInternals wiki page.
- * There is a patch to fix this on the Downloads page of the Selenium project
  * @type {string}
  */
-ChromeDriver.xmlHttpRequestUrl = "http://127.0.0.1:9700/chromeCommandExecutor";
+ChromeDriver.xmlHttpRequestUrl = null;
 
 
 /**
@@ -140,6 +137,12 @@ ChromeDriver.xmlHttpRequestUrl = "http://127.0.0.1:9700/chromeCommandExecutor";
 ChromeDriver.requestSequenceNumber = 0;
 
 
+/**
+ * @type {number}
+ */
+ChromeDriver.lastReceivedSequenceNumber = -2;
+
+
 /**
  * @type {number}
  */
@@ -189,6 +192,17 @@ resetCurrentlyWaitingOnContentScriptTime();
 ChromeDriver.waitForContentScriptIncrement = 100;
 
 chrome.extension.onConnect.addListener(function(port) {
+  if (ChromeDriver.xmlHttpRequestUrl == null) {
+    //This is the first content script, so is from the URL we need to connect to
+    ChromeDriver.xmlHttpRequestUrl = port.tab.url;
+    //Tell the ChromeCommandExecutor that we are here
+    sendResponseByXHR("", false);
+    return;
+  } else if (port.tab.url.indexOf(ChromeDriver.xmlHttpRequestUrl) == 0) {
+    //We have reloaded the xmlHttpRequest page.  Ignore the connection.
+    return;
+  }
+
   console.log("Connected to " + port.name);
   // Note: The frameset port *always* connects before any frame port.  After
   // that, the order is in page loading time
@@ -296,9 +310,6 @@ chrome.extension.onConnect.addListener(function(port) {
   });
 });
 
-//Tell the ChromeCommandExecutor that we are here
-sendResponseByXHR({statusCode: 0}, false);
-
 /**
  * Sends the passed argument as the result of a command
  * @param result object encapsulating result to send
@@ -498,8 +509,8 @@ function parseRequest(request) {
       sendResponseToParsedRequest({statusCode: 0, value: []});
       break;
     }
-  // Falling through, as if we do have a page, we want to treat this like a
-  // normal request
+    // Falling through, as if we do have a page, we want to treat this like a
+    // normal request
   case "deleteAllCookies":
   case "deleteCookie":
     if (hasNoPage()) {
@@ -507,8 +518,16 @@ function parseRequest(request) {
       sendResponseToParsedRequest({statusCode: 0});
       break;
     }
-  // Falling through, as if we do have a page, we want to treat this like a
-  // normal request
+    // Falling through, as if we do have a page, we want to treat this like a
+    // normal request
+  case "executeScript":
+    if (hasNoPage()) {
+      console.log("Not got a page, but asked to execute script, so sending error 17");
+      sendResponseToParsedRequest({statusCode: 17, value: {message: 'Was not on a page, so could not execute javascript'}});
+      break;
+    }
+    // Falling through, as if we do have a page, we want to treat this like a
+    // normal request
   default:
     var sequenceNumber = ChromeDriver.requestSequenceNumber;
     ChromeDriver.requestSequenceNumber++;
@@ -557,7 +576,7 @@ function parsePortMessage(message) {
   if (!message || !message.response || !message.response.value ||
       message.response.value.statusCode === undefined ||
       message.response.value.statusCode == null ||
-      message.sequenceNumber === undefined) {
+      message.sequenceNumber === undefined || message.sequenceNumber < ChromeDriver.lastReceivedSequenceNumber) {
     // Should only ever happen if we sent a bad request,
     // or the content script is broken
     console.log("Got invalid response from the content script.");

data/chrome/src/extension/content_script.js

@@ -87,7 +87,7 @@ function parsePortMessage(message) {
 
       if (element.click) {
         console.log("click");
-        execute("try { arguments[0].click(); } catch(e){}", {type: "ELEMENT", value: getElementId_(element)});
+        execute("try { arguments[0].click(); } catch(e){}", {type: "ELEMENT", value: addElementToInternalArray(element)});
       }
       response.value = {statusCode: 0};
       break;
@@ -457,6 +457,9 @@ function getElement(plural, lookupBy, lookupValue, id) {
   case "tag name":
     elements = getElementsByXPath(root + "//" + lookupValue);
     break;
+  case "css":
+    elements = parent.querySelectorAll(lookupValue);
+    break;
   case "xpath":
     if (root != "" && lookupValue[0] != "/") {
       //Because xpath is relative to the parent, if there is a parent, and the lookup seems to be implied sub-lookup, we add a /
@@ -502,6 +505,10 @@ function getElement(plural, lookupBy, lookupValue, id) {
   }
 }
 
+/**
+ * Adds the element to the internal element store, if it isn't already there.
+ * @return index of element in the array
+ */
 function addElementToInternalArray(element) {
   for (var existingElement in ChromeDriverContentScript.internalElementArray) {
     if (element == ChromeDriverContentScript.internalElementArray[existingElement]) {
@@ -545,23 +552,6 @@ function internalGetElement(elementIdAsString) {
   }
 }
 
-/**
- * Given an element, returning the index that can be used to locate it
- *
- * @param element the element to look up the internal ID of
- * @return A positive integer on success or -1 otherwise
- */
-function getElementId_(element) {
-  var length = ChromeDriverContentScript.internalElementArray.length;
-  for (var i = 0; i < length; i++) {
-    if (ChromeDriverContentScript.internalElementArray[i] === element) {
-      return i;
-    }
-  }
-
-  return -1;
-}
-
 /**
  * Ensures the passed element is in view, so that the native click event can be sent
  * @return object to send back to background page to trigger a native click
@@ -698,6 +688,18 @@ function selectElement(element) {
   if (!oldValue) {
     //TODO: Work out a way of firing events,
     //now that synthesising them gives appendMessage errors
+    if (tagName == "option") {
+      var select = element;
+      while (select.parentNode != null && select.tagName.toLowerCase() != "select") {
+        select = select.parentNode;
+      }
+      if (select.tagName.toLowerCase() == "select") {
+        element = select;
+      } else {
+        //If we're not within a select element, fire the event from the option, and hope that it bubbles up
+        console.log("Falling back to event firing from option, not select element");
+      }
+    }
     Utils.fireHtmlEvent(element, "change");
   }
   return {statusCode: 0};
@@ -717,10 +719,8 @@ function sendElementKeys(element, keys, elementId) {
   if (oldFocusedElement != element) {
     //TODO: Work out a way of firing events,
     //now that synthesising them gives appendMessage errors
-    oldFocusedElement.blur();
-    Utils.fireHtmlEvent(oldFocusedElement, "blur");
-    element.focus();
-    Utils.fireHtmlEvent(element, "focus");
+    Utils.fireHtmlEventAndConditionallyPerformAction(oldFocusedElement, "blur", function() {oldFocusedElement.blur();});
+    Utils.fireHtmlEventAndConditionallyPerformAction(element, "focus", function() {element.focus();});
   }
   return {statusCode: "no-op", keys: keys, elementId: elementId};
 }
@@ -742,10 +742,10 @@ function sendElementNonNativeKeys(element, keys) {
 function submitElement(element) {
   while (element != null) {
     if (element.tagName.toLowerCase() == "form") {
-      element.submit();
+      Utils.fireHtmlEventAndConditionallyPerformAction(element, "submit", function() {element.submit();});
       return {statusCode: 0};
     }
-    element = element.parentElement;
+    element = element.parentNode;
   }
   return {statusCode: 12, value: {message: "Cannot submit an element not in a form"}};
 }
@@ -765,7 +765,7 @@ function toggleElement(element) {
     if (tagName == "option") {
       var parent = element;
       while (parent != null && parent.tagName.toLowerCase() != "select") {
-        parent = parent.parentElement;
+        parent = parent.parentNode;
       }
       if (parent == null) {
         throw {statusCode: 12, value: {message: "option tag had no select tag parent"}};
@@ -871,19 +871,20 @@ function parseWrappedArguments(argument) {
  * We can't share objects between content script and page, so have to wrap up arguments as JSON
  * @param script script to execute as a string
  * @param passedArgs array of arguments to pass to the script
- * @param callback function to call when the result is returned
+ * @param callback function to call when the result is returned.  Passed a DOMAttrModified event which should be parsed as returnFromJavascriptInPage
+ * TODO: Make the callback be passed the parsed result.
  */
 function execute_(script, passedArgs, callback) {
   console.log("executing " + script + ", args: " + JSON.stringify(passedArgs));
   var func = "function(){" + script + "}";
   var args = [];
   for (var i = 0; i < passedArgs.length; ++i) {
-    console.log("Parsing: " + passedArgs[i]);
+    console.log("Parsing: " + JSON.stringify(passedArgs[i]));
     var value = parseWrappedArguments(passedArgs[i]);
     if (value.success) {
       args.push(value.value);
     } else {
-      ChromeDriverContentScript.port.postMessage(value.value);
+      ChromeDriverContentScript.port.postMessage({response: value.value, sequenceNumber: ChromeDriverContentScript.currentSequenceNumber});
       return;
     }
   }

data/chrome/src/extension/manifest-nonwin.json

@@ -11,7 +11,8 @@
     {
       "matches": ["http://*/*", "https://*/*", "file:///*"],
       "js": ["utils.js", "content_script.js"],
-      "run_at": "document_end"
+      "run_at": "document_end",
+      "all_frames": true
     }
   ],
   "permissions": ["http://*/*", "tabs"]

data/chrome/src/extension/manifest-win.json

@@ -11,7 +11,8 @@
     {
       "matches": ["http://*/*", "https://*/*", "file:///*"],
       "js": ["utils.js", "content_script.js"],
-      "run_at": "document_end"
+      "run_at": "document_end",
+      "all_frames": true
     }
   ],
   "plugins": [{"path": "npchromedriver.dll", "public": true}],

data/chrome/src/extension/utils.js

@@ -174,9 +174,20 @@ Utils.getText = function(element) {
     return text.slice(start, end);
 };
 
-Utils.fireHtmlEvent = function(element, eventName) {
+/**
+ * Fires the event using Utils.fireEvent, and if the event returned true,
+ * perform callback, which will be passed on arguments
+ */
+Utils.fireHtmlEventAndConditionallyPerformAction = function(element, eventName, callback) {
+    Utils.fireHtmlEvent(element, eventName, function(evt) { if (JSON.parse(evt.newValue).value) { callback(); } });
+};
+
+Utils.fireHtmlEvent = function(element, eventName, callback) {
+    if (callback === undefined) {
+      callback = function() {};
+    }
     var args = [
-      {type: "ELEMENT", value: getElementId_(element)},
+      {type: "ELEMENT", value: addElementToInternalArray(element)},
       {type: "STRING", value: eventName}
     ];
 
@@ -185,9 +196,9 @@ Utils.fireHtmlEvent = function(element, eventName) {
     // http://code.google.com/p/chromium/issues/detail?id=29071
     var script = "var e = document.createEvent('HTMLEvents'); "
       + "e.initEvent(arguments[1], true, true); " 
-      + "arguments[0].dispatchEvent(e);";
+      + "return arguments[0].dispatchEvent(e);";
 
-    execute_(script, args, function(){});
+    execute_(script, args, callback);
 };
 
 
@@ -197,7 +208,7 @@ Utils.fireMouseEventOn = function(element, eventName) {
 
 Utils.triggerMouseEvent = function(element, eventType, clientX, clientY) {
     var args = [
-      {type: "ELEMENT", value: getElementId_(element)},
+      {type: "ELEMENT", value: addElementToInternalArray(element)},
       {type: "STRING", value: eventType},
       {type: "NUMBER", value: clientX},
       {type: "NUMBER", value: clientY}

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

@@ -8,8 +8,7 @@ module Selenium
           @executor = CommandExecutor.new
 
           @launcher = Launcher.launcher
-          @launcher.launch
-          # TODO: @launcher.kill
+          @launcher.launch(@executor.uri)
         end
 
         def browser

data/chrome/src/rb/lib/selenium/webdriver/chrome/command_executor.rb

@@ -2,13 +2,16 @@ module Selenium
   module WebDriver
     module Chrome
      class CommandExecutor
-       TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json; charset=UTF-8\r\n\r\n%s"
+       HTML_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html; charset=UTF-8\r\n\r\n%s"
+       JSON_TEMPLATE = "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json; charset=UTF-8\r\n\r\n%s"
 
        def initialize
-         @server       = TCPServer.new("0.0.0.0", 9700)
+         @server       = TCPServer.new("0.0.0.0", 0)
          @queue        = Queue.new
+
          @accepted_any = false
          @next_socket  = nil
+         @listening    = true
 
          Thread.new { start_run_loop }
        end
@@ -20,7 +23,7 @@ module Selenium
          end
 
          json = command.to_json
-         data = TEMPLATE % [json.length, json]
+         data = JSON_TEMPLATE % [json.length, json]
 
          @next_socket.write data
          @next_socket.close
@@ -29,33 +32,47 @@ module Selenium
        end
 
        def close
-         @server.close
+         stop_listening
+         close_sockets
+         @server.close unless @server.closed?
        rescue IOError
+         nil
+       end
+
+       def port
+         @server.addr[1]
+       end
+
+       def uri
+         "http://localhost:#{port}/chromeCommandExecutor"
        end
 
        private
 
        def start_run_loop
-         loop do
+         while(@listening) do
            socket = @server.accept
-           @queue << socket
 
-           unless accepted_any?
-             read_response socket
-             @queue.pop
+           if socket.read(1) == "G" # initial GET(s)
+             write_holding_page_to socket
+           else
+             if accepted_any?
+               @queue << socket
+             else
+               read_response(socket)
+               @accepted_any = true
+             end
            end
-
-           @accepted_any ||= true
          end
-       rescue IOError => e
-         raise e unless @server.closed?
+       rescue IOError, Errno::EBADF
+         raise unless @server.closed?
        end
 
        def read_response(socket)
          result = ''
-
          seen_double_crlf = false
-         while !socket.closed? && ((line = socket.gets.chomp) != "EOResponse")
+
+         while line = next_line(socket)
            seen_double_crlf = true if line.empty?
            result << "#{line}\n" if seen_double_crlf
          end
@@ -63,14 +80,40 @@ module Selenium
          @next_socket = socket
 
          result.strip!
-         # p result
-         result
        end
 
        def accepted_any?
          @accepted_any
        end
 
+       def close_sockets
+         @queue.pop.close until @queue.empty?
+         @next_socket.close if @next_socket
+       end
+
+       def stop_listening
+         @listening = false
+       end
+
+       def next_line(socket)
+        return if socket.closed?
+        input = socket.gets
+
+        raise Error::WebDriverError, "unexpected EOF from Chrome" if input.nil?
+
+        line = input.chomp
+        return if line == "EOResponse"
+
+        line
+       end
+
+       def write_holding_page_to(socket)
+         msg = %[<html><head><script type='text/javascript'>if (window.location.search == '') { setTimeout("window.location = window.location.href + '?reloaded'", 5000); }</script></head><body><p>ChromeDriver server started and connected.  Please leave this tab open.</p></body></html>]
+
+         socket.write HTML_TEMPLATE % [msg.length, msg]
+         socket.close
+       end
+
      end # CommandExecutor
     end # Chrome
   end # WebDriver

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

@@ -21,10 +21,10 @@ module Selenium
           launcher
         end
 
-        def launch
+        def launch(server_url)
           create_extension
           create_profile
-          launch_chrome
+          launch_chrome server_url
 
           pid
         end
@@ -54,7 +54,8 @@ module Selenium
           touch "#{tmp_profile_dir}/First Run Dev"
         end
 
-        def launch_chrome
+        def launch_chrome(server_url)
+          check_binary_exists
           @process = ChildProcess.new Platform.wrap_in_quotes_if_necessary(binary_path),
                                       "--load-extension=#{Platform.wrap_in_quotes_if_necessary tmp_extension_dir}",
                                       "--user-data-dir=#{Platform.wrap_in_quotes_if_necessary tmp_profile_dir}",
@@ -62,10 +63,16 @@ module Selenium
                                       "--disable-hang-monitor",
                                       "--disable-popup-blocking",
                                       "--disable-prompt-on-repost",
-                                      "about:blank"
+                                      server_url
           @process.start
         end
 
+        def check_binary_exists
+          unless File.file?(binary_path)
+            raise Error::WebDriverError, "Could not find Chrome binary. Make sure Chrome is installed (OS: #{Platform.os})"
+          end
+        end
+
         def ext_path
           @ext_path ||= "#{WebDriver.root}/chrome/src/extension"
         end
@@ -95,7 +102,16 @@ module Selenium
           end
 
           def binary_path
-            @binary_path ||= "#{Platform.home}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe"
+            @binary_path ||= begin
+              possible_paths = [
+                "#{ENV['USERPROFILE']}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe",
+                "#{ENV['USERPROFILE']}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
+                "#{Platform.home}\\Local Settings\\Application Data\\Google\\Chrome\\Application\\chrome.exe",
+                "#{Platform.home}\\AppData\\Local\\Google\\Chrome\\Application\\chrome.exe",
+              ]
+
+              possible_paths.find { |f| File.exist?(f) } || possible_paths.first
+            end
           end
 
         end

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

@@ -1,6 +1,34 @@
 require "tmpdir"
 require "fileutils"
 
+def have_yajl?
+  require "yajl/json_gem"
+  true
+rescue LoadError
+  false
+end
+
+def have_json?
+  require "json"
+  true
+rescue LoadError
+  false
+end
+
+unless have_yajl? || have_json?
+  raise LoadError, <<-END
+
+       You need to require rubygems or install one of these gems:
+
+           yajl-ruby (best on MRI)
+           json
+           json-jruby (native JRuby)
+           json_pure (any platform)
+
+  END
+end
+
+
 require "selenium/webdriver/core_ext/dir"
 require "selenium/webdriver/error"
 require "selenium/webdriver/platform"
@@ -15,21 +43,6 @@ require "selenium/webdriver/bridge_helper"
 require "selenium/webdriver/driver"
 require "selenium/webdriver/element"
 
-begin
-  require "json" # gem dependency
-rescue LoadError => e
-  msg = Selenium::WebDriver::Platform.jruby? ? "jruby -S gem install json-jruby" : "gem install json"
-
-
-  raise LoadError, <<-END
-       #{e.message}
-
-       You need to install the json gem or (require rubygems):
-           #{msg}
-  END
-end
-
-
 module Selenium
   module WebDriver
     Point     = Struct.new(:x, :y)

data/common/src/rb/lib/selenium/webdriver/bridge_helper.rb

@@ -45,8 +45,11 @@ module Selenium
         end
       end
 
-      def element_id_from(arr)
-        arr.to_s.split("/").last
+      def element_id_from(id)
+        str = id.kind_of?(Array) ? id.first : id
+        after = str.split("/").last
+
+        after
       end
 
       def parse_cookie_string(str)

data/common/src/rb/lib/selenium/webdriver/child_process.rb

@@ -94,6 +94,7 @@ module Selenium
 
         def wait
           @process.waitFor
+          [nil, @process.exitValue] # no robust way to get pid here
         end
 
         def exit_value

data/common/src/rb/lib/selenium/webdriver/driver.rb

@@ -39,7 +39,7 @@ module Selenium
                    when :firefox, :ff
                      WebDriver::Firefox::Bridge.new(*args)
                    else
-                     raise ArgumentError, "unknown driver: #{driver.inspect}"
+                     raise ArgumentError, "unknown driver: #{browser.inspect}"
                    end
 
            driver = new(bridge)

data/common/src/rb/lib/selenium/webdriver/element.rb

@@ -73,15 +73,25 @@ module Selenium
       #
       # Send keystrokes to this element
       #
-      # @param [String, Symbol]
+      # @param [String, Symbol, Array]
+      #
+      # Examples:
+      #
+      #     element.send_keys "foo"                     #=> value: 'foo'
+      #     element.send_keys "tet", :arrow_left, "s"   #=> value: 'test'
+      #     element.send_keys [:control, 'a'], :space   #=> value: ' '
       #
       # @see Keys::KEYS
       #
 
       def send_keys(*args)
         args.each do |arg|
-          if arg.kind_of?(Symbol)
+          case arg
+          when Symbol
             arg = Keys[arg]
+          when Array
+            arg = arg.map { |e| e.kind_of?(Symbol) ? Keys[e] : e }.join
+            arg << Keys[:null]
           end
 
           bridge.sendKeysToElement(@id, arg.to_s)

data/common/src/rb/lib/selenium/webdriver/keys.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Selenium
   module WebDriver
     module Keys
@@ -5,13 +7,15 @@ module Selenium
       #
       # @see Element#send_keys
       #
+      # http://www.google.com.au/search?&q=unicode+pua&btnG=Search
+      #
 
       KEYS = {
       # \x works on both 1.8.6/1.9
         :null         => "\xEE\x80\x80",
         :cancel       => "\xEE\x80\x81",
         :help         => "\xEE\x80\x82",
-        :back_space   => "\xEE\x80\x83",
+        :backspace    => "\xEE\x80\x83",
         :tab          => "\xEE\x80\x84",
         :clear        => "\xEE\x80\x85",
         :return       => "\xEE\x80\x86",
@@ -72,7 +76,7 @@ module Selenium
       }
 
       def self.[](key)
-        KEYS[key] || raise(Error::UnsupportedOperationError, "no such key #{e.inspect}")
+        KEYS[key] || raise(Error::UnsupportedOperationError, "no such key #{key.inspect}")
       end
 
     end # Keys

data/common/src/rb/lib/selenium/webdriver/target_locator.rb

@@ -21,9 +21,22 @@ module Selenium
       #
       # switch to the frame with the given id
       #
+      # If given a block, this method will return to the original window after
+      # block execution.
+      #
+      # @param id
+      #   A window handle
+      #
 
       def window(id)
-        @bridge.switchToWindow id
+        if block_given?
+          original = @bridge.getCurrentWindowHandle
+          @bridge.switchToWindow id
+          yield
+          @bridge.switchToWindow original
+        else
+          @bridge.switchToWindow id
+        end
       end
 
       #

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

@@ -191,48 +191,92 @@ DelayedCommand.prototype.execute = function(ms) {
 };
 
 
+/**
+ * @return {boolean} Whether this instance should delay execution of its
+ *     command for a pending request in the current window's nsILoadGroup.
+ */
+DelayedCommand.prototype.shouldDelayExecutionForPendingRequest_ = function() {
+  try {
+    if (this.loadGroup_.isPending()) {
+      var hasOnLoadBlocker = false;
+      var numPending = 0;
+      var requests = this.loadGroup_.requests;
+      while (requests.hasMoreElements()) {
+        var request =
+            requests.getNext().QueryInterface(Components.interfaces.nsIRequest);
+        if (request.isPending()) {
+          numPending += 1;
+          hasOnLoadBlocker = hasOnLoadBlocker ||
+                             (request.name == 'about:document-onload-blocker');
+
+          if (numPending > 1) {
+            // More than one pending request, need to wait.
+            return true;
+          }
+        }
+      }
+
+      if (numPending && !hasOnLoadBlocker) {
+        Utils.dumpn('Ignoring pending about:document-onload-blocker request');
+        // If we only have one pending request and it is not a
+        // document-onload-blocker, we need to wait.  We do not wait for
+        // document-onload-blocker requests since these are created when
+        // one of document.[open|write|writeln] is called. If document.close is
+        // never called, the document-onload-blocker request will not be
+        // completed.
+        return true;
+      }
+    }
+  } catch(e) {
+    Utils.dumpn('Problem while checking if we should delay execution: ' + e);
+  }
+
+  return false;
+};
+
+
 /**
  * Attempts to execute the command.  If the window is not ready for the command
  * to execute, will set a timeout to try again.
  * @private
  */
 DelayedCommand.prototype.executeInternal_ = function() {
-  if (this.loadGroup_.isPending()) {
+  if (this.shouldDelayExecutionForPendingRequest_()) {
+    return this.execute(this.sleepDelay_);
+  }
+
+  // Ugh! New windows open on "about:blank" before going to their
+  // destination URL. This check attempts to tell the difference between a
+  // newly opened window and someone actually wanting to do something on
+  // about:blank.
+  if (this.driver_.window.location == 'about:blank' && !this.onBlank_) {
+    this.onBlank_ = true;
     return this.execute(this.sleepDelay_);
   } else {
-    // Ugh! New windows open on "about:blank" before going to their
-    // destination URL. This check attempts to tell the difference between a
-    // newly opened window and someone actually wanting to do something on
-    // about:blank.
-    if (this.driver_.window.location == 'about:blank' && !this.onBlank_) {
-      this.onBlank_ = true;
-      return this.execute(this.sleepDelay_);
-    } else {
-      try {
-        this.response_.commandName = this.command_.commandName;
-        // TODO(simon): This is rampantly ugly, but allows an alert to kill the command
-        // TODO(simon): This is never cleared, but _should_ be okay, because send wipes itself
-        this.driver_.response_ = this.response_;
-
-        this.driver_[this.command_.commandName](
-            this.response_, this.command_.parameters);
-      } catch (e) {
-        // if (e instanceof StaleElementError) won't work here since
-        // StaleElementError is defined in the utils.js subscript which is
-        // loaded independently in this component and in the main driver
-        // component.
-        // TODO(jmleyba): Continue cleaning up the extension and replacing the
-        // subscripts with proper components.
-        if (e.isStaleElementError) {
-          this.response_.isError = true;
-          this.response_.response = 'element is obsolete';
-          this.response_.send();
-        } else {
-          Utils.dumpn(
-              'Exception caught by driver: ' + this.command_.commandName +
-              '(' + this.command_.parameters + ')\n' + e);
-          this.response_.reportError(e);
-        }
+    try {
+      this.response_.commandName = this.command_.commandName;
+      // TODO(simon): This is rampantly ugly, but allows an alert to kill the command
+      // TODO(simon): This is never cleared, but _should_ be okay, because send wipes itself
+      this.driver_.response_ = this.response_;
+
+      this.driver_[this.command_.commandName](
+          this.response_, this.command_.parameters);
+    } catch (e) {
+      // if (e instanceof StaleElementError) won't work here since
+      // StaleElementError is defined in the utils.js subscript which is
+      // loaded independently in this component and in the main driver
+      // component.
+      // TODO(jmleyba): Continue cleaning up the extension and replacing the
+      // subscripts with proper components.
+      if (e.isStaleElementError) {
+        this.response_.isError = true;
+        this.response_.response = 'element is obsolete';
+        this.response_.send();
+      } else {
+        Utils.dumpn(
+            'Exception caught by driver: ' + this.command_.commandName +
+            '(' + this.command_.parameters + ')\n' + e);
+        this.response_.reportError(e);
       }
     }
   }

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

@@ -865,7 +865,7 @@ Utils.fireHtmlEvent = function(context, element, eventName) {
   var doc = element.ownerDocument;
   var e = doc.createEvent("HTMLEvents");
   e.initEvent(eventName, true, true);
-  element.dispatchEvent(e);
+  return element.dispatchEvent(e);
 };
 
 

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

@@ -268,7 +268,7 @@ FirefoxDriver.prototype.getAttribute = function(respond, value) {
   attributeName = attributeName.toLowerCase();
 
   if (attributeName == "disabled") {
-    respond.response = element.disabled;
+    respond.response = (element.disabled === undefined ? false : element.disabled);
     respond.send();
     return;
   } else if ((attributeName == "checked" || attributeName == "selected") &&
@@ -315,25 +315,37 @@ FirefoxDriver.prototype.hover = function(respond) {
   respond.send();
 };
 
-
 FirefoxDriver.prototype.submit = function(respond) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
-  var submitElement = Utils.findForm(element);
-  if (submitElement) {
-    new WebLoadingListener(Utils.getBrowser(respond.context), function() {
+  if (element) {
+    while (element.parentNode != null && element.tagName.toLowerCase() != "form") {
+      element = element.parentNode;
+    }
+    if (element.tagName.toLowerCase() == "form") {
+      if (Utils.fireHtmlEvent(respond.context, element, "submit")) {
+        new WebLoadingListener(Utils.getBrowser(respond.context), function() {
+          respond.send();
+        });
+        element.submit();
+        return;
+      } else {
+        //Event was blocked, so don't submit
+        respond.send();
+        return;
+      }
+    } else {
+      respond.isError = true;
+      respond.response = "Element was not in a form so couldn't submit";
       respond.send();
-    });
-    if (submitElement["submit"])
-      submitElement.submit();
-    else
-      submitElement.click();
+      return;
+    }
   } else {
     respond.send();
+    return;
   }
 };
 
-
 FirefoxDriver.prototype.isSelected = function(respond) {
   var element = Utils.getElementAt(respond.elementId, respond.context);
 
@@ -388,10 +400,21 @@ FirefoxDriver.prototype.setSelected = function(respond) {
   try {
     var option =
         element.QueryInterface(Components.interfaces.nsIDOMHTMLOptionElement);
+    var select = element;
+    while (select.parentNode != null && select.tagName.toLowerCase() != "select") {
+      select = select.parentNode;
+    }
+    if (select.tagName.toLowerCase() == "select") {
+      select = select.QueryInterface(Components.interfaces.nsIDOMHTMLSelectElement);
+    } else {
+      //If we're not within a select element, fire the event from the option, and hope that it bubbles up
+      Utils.dumpn("Falling back to event firing from option, not select element");
+      select = option;
+    }
     respond.isError = false;
     if (!option.selected) {
       option.selected = true;
-      Utils.fireHtmlEvent(respond.context, option, "change");
+      Utils.fireHtmlEvent(respond.context, select, "change");
     }
     wasSet = "";
   } catch(e) {

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

@@ -16,8 +16,9 @@ module Selenium
             _, status = wait
           end
 
-          if status && !status.success?
-            raise Error::WebDriverError, "could not create base profile: (exit status: #{status.exitstatus})"
+
+          if status && status.to_i != 0
+            raise Error::WebDriverError, "could not create base profile: (exit status: #{status})"
           end
         end
 

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

@@ -81,13 +81,13 @@ module Selenium
         #
 
         def session_id
-          @session_id || raise(StandardError, "no current session exists")
+          @session_id || raise(Error::WebDriverError, "no current session exists")
         end
 
 
         def create_session(desired_capabilities)
-          resp  = raw_execute :newSession, {}, desired_capabilities
-          @session_id = resp['sessionId'] || raise('no sessionId in returned payload')
+          resp = raw_execute :newSession, {}, desired_capabilities
+          @session_id = resp['sessionId'] || raise(Error::WebDriverError, 'no sessionId in returned payload')
           Capabilities.json_create resp['value']
         end
 
@@ -160,7 +160,9 @@ module Selenium
         end
 
         def executeScript(script, *args)
-          raise UnsupportedOperationError, "underlying webdriver instace does not support javascript" unless capabilities.javascript?
+          unless capabilities.javascript?
+            raise Error::UnsupportedOperationError, "underlying webdriver instance does not support javascript"
+          end
 
           typed_args = args.map { |arg| wrap_script_argument(arg) }
           response   = raw_execute :executeScript, {}, script, typed_args
@@ -370,14 +372,14 @@ module Selenium
         #
 
         def raw_execute(command, opts = {}, *args)
-          verb, path = COMMANDS[command] || raise("Unknown command #{command.inspect}")
+          verb, path = COMMANDS[command] || raise("unknown command #{command.inspect}")
           path       = path.dup
 
           path[':session_id'] = @session_id if path.include?(":session_id")
           path[':context']    = @context if path.include?(":context")
 
           begin
-            opts.each { |key, value| path[key.inspect] = value }
+            opts.each { |key, value| path[key.inspect] = URI.escape(value.to_s) }
           rescue IndexError
             raise ArgumentError, "#{opts.inspect} invalid for #{command.inspect}"
           end

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

@@ -71,10 +71,10 @@ module Selenium
           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?
+        # @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
         #

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

@@ -4,7 +4,8 @@ module Selenium
   module WebDriver
     module Remote
       class DefaultHttpClient
-        CONTENT_TYPE = "application/json"
+        CONTENT_TYPE    = "application/json"
+        DEFAULT_HEADERS = { "Accept" => CONTENT_TYPE }
 
         class RetryException < StandardError; end
 
@@ -15,7 +16,7 @@ module Selenium
         def call(verb, url, *args)
           response = nil
           url      = @server_url.merge(url) unless url.kind_of?(URI)
-          headers  = { "Accept" => CONTENT_TYPE }
+          headers  = DEFAULT_HEADERS.dup
 
           if args.any?
             headers.merge!("Content-Type" => "#{CONTENT_TYPE}; charset=utf-8")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: selenium-webdriver
 version: !ruby/object:Gem::Version 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +01:00
+date: 2010-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency