selenium-webdriver 0.0.14 → 0.0.15

data/common/src/js/core/scripts/selenium-api.js

@@ -2364,7 +2364,7 @@ Selenium.prototype.doAllowNativeXpath = function(allow) {
     if ("false" == allow || "0" == allow) { // The strings "false" and "0" are true values in JS
         allow = false;
     }
-    this.browserbot.allowNativeXpath = allow;
+    this.browserbot.setAllowNativeXPath(allow);
 }
 
 Selenium.prototype.doIgnoreAttributesWithoutValue = function(ignore) {
@@ -2386,7 +2386,7 @@ Selenium.prototype.doIgnoreAttributesWithoutValue = function(ignore) {
     if ('false' == ignore || '0' == ignore) {
         ignore = false;
     }
-    this.browserbot.ignoreAttributesWithoutValue = ignore;
+    this.browserbot.setIgnoreAttributesWithoutValue(ignore);
 }
 
 Selenium.prototype.doWaitForCondition = function(script, timeout) {
@@ -3132,7 +3132,7 @@ Selenium.prototype.doRemoveScript = function(scriptTagId) {
 
 Selenium.prototype.doUseXpathLibrary = function(libraryName) {
     /**
-	* Allows choice of one of the available libraries.
+    * Allows choice of one of the available libraries.
     * @param libraryName name of the desired library
     * Only the following three can be chosen:
     * <ul>
@@ -3140,22 +3140,17 @@ Selenium.prototype.doUseXpathLibrary = function(libraryName) {
     *   <li>"javascript-xpath" - Cybozu Labs' faster library</li>
     *   <li>"default" - The default library.  Currently the default library is "ajaxslt" .</li>
     * </ul>
-    * If libraryName isn't one of these three, then 
-    * no change will be made.
-    *   
+    * If libraryName isn't one of these three, it may be the name of another
+    * engine registered to the browserbot's XPathEvaluator, for example by
+    * overriding XPathEvaluator.prototype.init() . If it is not a registered
+    * engine either, then no change will be made.
     */
 
-    if (libraryName == "default") {
-        this.browserbot.xpathLibrary = this.browserbot.defaultXpathLibrary;
+    if (! this.browserbot.getXPathEngine(libraryName)) {
         return;
     }
-
-	if ((libraryName != 'ajaxslt') && (libraryName != 'javascript-xpath')) {
-		return;
-	}
-	
-	this.browserbot.xpathLibrary = libraryName;	
-	
+    
+    this.browserbot.setXPathEngine(libraryName);
 };
 
 /**

data/common/src/js/core/scripts/selenium-browserbot.js

@@ -37,8 +37,8 @@ var BrowserBot = function(topLevelApplicationWindow) {
     this.currentWindow = this.topWindow;
     this.currentWindowName = null;
     this.allowNativeXpath = true;
-    this.xpathLibrary = this.defaultXpathLibrary = 'ajaxslt' // change to "javascript-xpath" for the newer, faster engine
-
+    this.xpathEvaluator = new XPathEvaluator('ajaxslt');  // change to "javascript-xpath" for the newer, faster engine
+    
     // We need to know this in advance, in case the frame closes unexpectedly
     this.isSubFrameSelected = false;
 
@@ -126,7 +126,22 @@ var BrowserBot = function(topLevelApplicationWindow) {
           return self.newPageLoaded && (self.isXhrSent ? (self.abortXhr || self.isXhrDone) : true); 
         }
     };
-
+    
+    this.setAllowNativeXPath = function(allow) {
+        this.xpathEvaluator.setAllowNativeXPath(allow);
+    };
+    
+    this.setIgnoreAttributesWithoutValue = function(ignore) {
+        this.xpathEvaluator.setIgnoreAttributesWithoutValue(ignore);
+    };
+    
+    this.setXPathEngine = function(engineName) {
+        this.xpathEvaluator.setCurrentEngine(engineName);
+    };
+    
+    this.getXPathEngine = function() {
+        return this.xpathEvaluator.getCurrentEngine();
+    };
 };
 
 // DGF PageBot exists for backwards compatibility with old user-extensions
@@ -1404,7 +1419,9 @@ BrowserBot.prototype.findElement = function(locator, win) {
  * we search separately by id and name.
  */
 BrowserBot.prototype.locateElementByIdentifier = function(identifier, inDocument, inWindow) {
-    return BrowserBot.prototype.locateElementById(identifier, inDocument, inWindow)
+    // HBC - use "this" instead of "BrowserBot.prototype"; otherwise we lose
+    // the non-prototype fields of the object!
+    return this.locateElementById(identifier, inDocument, inWindow)
             || BrowserBot.prototype.locateElementByName(identifier, inDocument, inWindow)
             || null;
 };
@@ -1420,8 +1437,7 @@ BrowserBot.prototype.locateElementById = function(identifier, inDocument, inWind
     else if (browserVersion.isIE || browserVersion.isOpera) {
         // SEL-484
         var xpath = '/descendant::*[@id=' + identifier.quoteForXPath() + ']';
-        return BrowserBot.prototype
-            .locateElementByXPath(xpath, inDocument, inWindow);
+        return this.locateElementByXPath(xpath, inDocument, inWindow);
     }
     else {
         return null;
@@ -1475,14 +1491,8 @@ BrowserBot.prototype.locateElementByDomTraversal.prefix = "dom";
  * begin with "//".
  */
 BrowserBot.prototype.locateElementByXPath = function(xpath, inDocument, inWindow) {
-    var results = eval_xpath(xpath, inDocument, {
-        returnOnFirstMatch          : true,
-        ignoreAttributesWithoutValue: this.ignoreAttributesWithoutValue,
-        allowNativeXpath            : this.allowNativeXpath,
-        xpathLibrary                : this.xpathLibrary,
-        namespaceResolver           : this._namespaceResolver
-    });
-    return (results.length > 0) ? results[0] : null;
+    return this.xpathEvaluator.selectSingleNode(inDocument, xpath, null,
+        this._namespaceResolver);
 };
 
 BrowserBot.prototype._namespaceResolver = function(prefix) {
@@ -1499,13 +1509,8 @@ BrowserBot.prototype._namespaceResolver = function(prefix) {
  * Returns the number of xpath results.
  */
 BrowserBot.prototype.evaluateXPathCount = function(xpath, inDocument) {
-    var results = eval_xpath(xpath, inDocument, {
-        ignoreAttributesWithoutValue: this.ignoreAttributesWithoutValue,
-        allowNativeXpath            : this.allowNativeXpath,
-        xpathLibrary                : this.xpathLibrary,
-        namespaceResolver           : this._namespaceResolver
-    });
-    return results.length;
+    return this.xpathEvaluator.countNodes(inDocument, xpath, null,
+        this._namespaceResolver);
 };
 
 /**

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

@@ -13,6 +13,8 @@ module Selenium
 
         if Platform.jruby?
           extend JRubyProcess
+        elsif Platform.ironruby?
+          extend IronRubyProcess
         elsif Platform.os == :windows
           extend WindowsProcess
         end
@@ -42,28 +44,32 @@ module Selenium
       end
 
       def wait
-        raise "called wait with no pid" unless @pid
+        assert_started
         Process.waitpid2 @pid
       rescue Errno::ECHILD
         nil
       end
 
       def kill
-        Process.kill('TERM', @pid) if @pid
+        assert_started
+        Process.kill('TERM', @pid)
       end
 
       def kill!
-        Process.kill('KILL', @pid) if @pid
+        assert_started
+        Process.kill('KILL', @pid)
+      end
+
+      def assert_started
+        raise Error::WebDriverError, "process not started" unless @pid
       end
 
       module WindowsProcess
         def start
-          require "win32/process" # adds a dependency on windows
+          require "win32/process" # adds a dependency on windows - perhaps we could just use FFI instead?
           @pid = Process.create(
             :app_name        => @args.join(" "),
-            :process_inherit => true,
-            :thread_inherit  => true,
-            :inherit         => true
+            :inherit         => false # don't inherit open file handles
           ).process_id
 
           self
@@ -88,20 +94,68 @@ module Selenium
         end
 
         def kill
-          @process.destroy if @process
+          assert_started
+          @process.destroy
         end
         alias_method :kill!, :kill
 
         def wait
+          assert_started
           @process.waitFor
           [nil, @process.exitValue] # no robust way to get pid here
         end
 
         def exit_value
+          assert_started
           @process.exitValue
         rescue java.lang.IllegalThreadStateException
           nil
         end
+
+        def assert_started
+          raise Error::WebDriverError, "process not started" unless @process
+        end
+      end
+
+      module IronRubyProcess
+        def start
+          args = @args.dup
+
+          @process                           = System::Diagnostics::Process.new
+          @process.StartInfo.UseShellExecute = true
+          @process.StartInfo.FileName        = args.shift
+          @process.StartInfo.Arguments       = args.join ' '
+          @process.start
+
+          self
+        end
+
+        def kill
+          assert_started
+          @process.Kill
+        end
+
+        def wait
+          assert_started
+          @process.WaitForExit
+          [pid, exit_value]
+        end
+
+        def pid
+          assert_started
+          @process.Id
+        end
+
+        def exit_value
+          assert_started
+          return unless @process.HasExited
+
+          @process.ExitCode
+        end
+
+        def assert_started
+          raise Error::WebDriverError, "process not started" unless @process
+        end
       end
 
     end # ChildProcess

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

@@ -3,15 +3,16 @@ module Selenium
     module Find
 
       FINDERS = {
-        :class             => 'ByClassName',
-        :class_name        => 'ByClassName',
-        :id                => 'ById',
-        :link_text         => 'ByLinkText',
-        :link              => 'ByLinkText',
-        :partial_link_text => 'ByPartialLinkText',
-        :name              => 'ByName',
-        :tag_name          => 'ByTagName',
-        :xpath             => 'ByXpath',
+        :class             => 'ClassName',
+        :class_name        => 'ClassName',
+        :css               => 'CssSelector',
+        :id                => 'Id',
+        :link              => 'LinkText',
+        :link_text         => 'LinkText',
+        :name              => 'Name',
+        :partial_link_text => 'PartialLinkText',
+        :tag_name          => 'TagName',
+        :xpath             => 'Xpath',
       }
 
       #
@@ -31,7 +32,7 @@ module Selenium
           raise ArgumentError, "cannot find element by #{how.inspect}"
         end
 
-        meth = "findElement#{by}"
+        meth = "findElementBy#{by}"
         what = what.to_s
 
         bridge.send meth, ref, what
@@ -52,7 +53,7 @@ module Selenium
           raise ArgumentError, "cannot find elements by #{how.inspect}"
         end
 
-        meth = "findElements#{by}"
+        meth = "findElementsBy#{by}"
         what = what.to_s
 
         bridge.send meth, ref, what

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

@@ -1,3 +1,5 @@
+require "rbconfig"
+
 module Selenium
   module WebDriver
     module Platform
@@ -10,43 +12,39 @@ module Selenium
       end
 
       def platform
-        @platform ||= case RUBY_PLATFORM
-                      when /java/
-                        :java
-                      when /mswin|msys|mingw32/
-                        :windows
-                      when /darwin/
-                        :macosx
-                      when /linux/
-                        :linux
-                      when /solaris|bsd/
-                        :unix
-                      else
-                        RUBY_PLATFORM
-                      end
+        @platform ||= begin
+          if defined? RUBY_ENGINE
+            RUBY_ENGINE.to_sym
+          else
+            :ruby
+          end
+        end
       end
 
       def os
         @os ||= begin
-          os = platform()
-
-          if os == :java
-            require "java"
-            os_name = java.lang.System.getProperty("os.name")
-            os = case os_name
-                  when /windows/i then :windows
-                  when /mac os/i  then :macosx
-                  when /linux/i   then :linux
-                  else                 os_name
-                  end
-          end
-
-          os
+           case Config::CONFIG['host_os']
+           when /mswin|msys|mingw32/
+             :windows
+           when /darwin|mac os/
+             :macosx
+           when /linux/
+             :linux
+           when /solaris|bsd/
+             :unix
+           else
+             # unlikely
+             raise Error::WebDriverError, "unknown os #{Config::CONFIG['host_os']}"
+           end
         end
       end
 
       def jruby?
-        platform == :java
+        platform == :jruby
+      end
+
+      def ironruby?
+        platform == :ironruby
       end
 
       def ruby187?
@@ -78,11 +76,11 @@ module Selenium
 end # Selenium
 
 if __FILE__ == $0
-  p :platform => WebDriver::Platform.platform,
-    :os       => WebDriver::Platform.os,
-    :ruby187? => WebDriver::Platform.ruby187?,
-    :ruby19?  => WebDriver::Platform.ruby19?,
-    :jruby?   => WebDriver::Platform.jruby?,
-    :win?     => WebDriver::Platform.win?,
-    :home     => WebDriver::Platform.home
+  p :platform => Selenium::WebDriver::Platform.platform,
+    :os       => Selenium::WebDriver::Platform.os,
+    :ruby187? => Selenium::WebDriver::Platform.ruby187?,
+    :ruby19?  => Selenium::WebDriver::Platform.ruby19?,
+    :jruby?   => Selenium::WebDriver::Platform.jruby?,
+    :win?     => Selenium::WebDriver::Platform.win?,
+    :home     => Selenium::WebDriver::Platform.home
 end

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

@@ -49,6 +49,14 @@ module Selenium
         @bridge.switchToActiveElement
       end
 
+      #
+      # selects either the first frame on the page, or the main document when a page contains iframes.
+      #
+
+      def default_content
+        @bridge.switchToDefaultContent
+      end
+
     end # TargetLocator
   end # WebDriver
 end  # Selenium

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

@@ -37,24 +37,52 @@ function localdump(message) {
   }
 }
 
-function WdCertOverrideService() {
+function getPreferenceFromProfile(prefName, prefDefaultValue) {
   var prefs =
       CC["@mozilla.org/preferences-service;1"].getService(CI["nsIPrefBranch"]);
 
-  this.acceptAll = undefined;
-  if (!prefs.prefHasUserValue("webdriver_accept_untrusted_certs")) {
-    localdump('webdriver_accept_untrusted_certs not set; defaulting to true');
-    this.acceptAll = true;
+  if (!prefs.prefHasUserValue(prefName)) {
+    localdump(prefName + ' not set; defaulting to ' + prefDefaultValue);
+    return prefDefaultValue;
+  }
+
+  var prefValue = prefs.getBoolPref(prefName);
+  localdump("Found preference for " + prefName + ": " + prefValue);
+
+  return prefValue;
+}
+
+function shouldAcceptUntrustedCerts() {
+  return getPreferenceFromProfile("webdriver_accept_untrusted_certs", true);
+}
+
+function shouldAssumeUntrustedIssuer() {
+  return getPreferenceFromProfile("webdriver_assume_untrusted_issuer", true);
+}
+
+function WdCertOverrideService() {
+  // Defaults to true - accepting untrusted certificates.
+  // This puts the module into effect - setting it to false
+  // will delegate all calls to the original service.
+  this.acceptAll = shouldAcceptUntrustedCerts();
+
+  // If untrusted issuer is set to false by the user,
+  // the initial bitmask will not include ERROR_UNTRUSTED.
+  //
+  // See the javadoc for FirefoxProfile and documentation
+  // for fillNeededBits for further explanation.
+  var untrusted_issuer = shouldAssumeUntrustedIssuer();
+  if (untrusted_issuer) {
+    this.default_bits = this.ERROR_UNTRUSTED;
   } else {
-    localdump("Found preference for webdriver_accept_untrusted_certs: " +
-              prefs.getBoolPref("webdriver_accept_untrusted_certs"));
-    this.acceptAll = prefs.getBoolPref("webdriver_accept_untrusted_certs");
+    this.default_bits = 0;
   }
-  // UUID of the original implementor of this service.
-  var ORIGINAL_OVERRIDE_SERVICE_ID = "{67ba681d-5485-4fff-952c-2ee337ffdcd6}";
 
   localdump("Accept untrusted certificates: " + this.acceptAll);
 
+  // UUID of the original implementor of this service.
+  var ORIGINAL_OVERRIDE_SERVICE_ID = "{67ba681d-5485-4fff-952c-2ee337ffdcd6}";
+
   // Keep a reference to the original bad certificate listener.
   var originalService = Components.classesByID[ORIGINAL_OVERRIDE_SERVICE_ID].
       getService();
@@ -64,12 +92,76 @@ function WdCertOverrideService() {
         Components.interfaces.nsICertOverrideService);
 };
 
+// Constants needed since WdCertOverrideService implements
+// nsICertOverrideService
 WdCertOverrideService.prototype = {
   ERROR_UNTRUSTED: 1,
   ERROR_MISMATCH: 2,
   ERROR_TIME: 4
 };
 
+// Returns the bit needed to mask if the certificate has expired, 0 otherwise.
+WdCertOverrideService.prototype.certificateExpiredBit_ = function
+  (theCert, verification_result) {
+  if ((verification_result & theCert.CERT_EXPIRED) != 0) {
+    localdump("Certificate expired.");
+    return this.ERROR_TIME;
+  }
+
+  return 0;
+}
+
+// Returns the bit needed to mask untrusted issuers, 0 otherwise.
+// Note that this bit is already set by default in default_bits
+WdCertOverrideService.prototype.certificateIssuerUntrusted_ = function
+  (theCert, verification_result) {
+  if (((verification_result & theCert.ISSUER_UNKNOWN) != 0) ||
+      ((verification_result & theCert.ISSUER_NOT_TRUSTED) != 0) ||
+      ((verification_result & theCert.CERT_NOT_TRUSTED) != 0) ||
+      ((verification_result & theCert.INVALID_CA) != 0)) {
+    localdump("Certificate issuer unknown.");
+    return this.ERROR_UNTRUSTED;
+  }
+
+  return 0;
+}
+
+// Returns the bit needed to mask mismatch between actual hostname
+// and the hostname the certificate was issued for, 0 otherwise.
+WdCertOverrideService.prototype.certificateHostnameMismatch_ = function
+  (theCert, aHost) {
+  if (theCert.commonName !== aHost) {
+    localdump("Host name mismatch: cert: " + theCert.commonName + " get: " + aHost);
+    return this.ERROR_MISMATCH;
+  }
+
+  return 0;
+}
+
+// Given a certificate and the host it was received for, fill in the bits
+// needed to accept this certificate for this host, even though the 
+// certificate is invalid.
+//
+// Note that the bitmask has to be accurate: At the moment, Firefox expects
+// the returned bitmask to match *exactly* to the errors the certificate
+// caused. If extra bits will be set, the untrusted certificate screen
+// will appear.
+WdCertOverrideService.prototype.fillNeededBits = function(aCert, aHost) {
+  var verification_bits = aCert.verifyForUsage(aCert.CERT_USAGE_SSLClient);
+  var return_bits = this.default_bits;
+
+  localdump("Certificate verification results: " + verification_bits);
+
+  return_bits = return_bits | this.certificateExpiredBit_(
+      aCert, verification_bits);
+  return_bits = return_bits | this.certificateIssuerUntrusted_(
+      aCert, verification_bits);
+  return_bits = return_bits | this.certificateHostnameMismatch_(aCert, aHost);
+  localdump("return_bits now: " + return_bits);
+  return return_bits;
+};
+
+// Interface functions from now on.
 WdCertOverrideService.prototype.hasMatchingOverride = function(
     aHostName, aPort, aCert, aOverrideBits, aIsTemporary) {
   var retval = false;
@@ -78,9 +170,9 @@ WdCertOverrideService.prototype.hasMatchingOverride = function(
     localdump("Allowing certificate from site: " + aHostName + ":" + aPort);
     retval = true;
     aIsTemporary.value = false;
-    aOverrideBits.value = this.ERROR_UNTRUSTED | this.ERROR_MISMATCH |
-        this.ERROR_TIME;
-    localdump("Bits: " + aOverrideBits.value);
+
+    aOverrideBits.value = this.fillNeededBits(aCert, aHostName);
+    localdump("Override Bits: " + aOverrideBits.value);
   } else {
     retval = this.origListener_.hasMatchingOverride(aHostName, aPort,
               aCert, aOverrideBits, aIsTemporary);
@@ -119,15 +211,25 @@ WdCertOverrideService.prototype.rememberValidityOverride = function(
       aHostName, aPort, aCert, aOverrideBits, aTemporary);
 };
 
+WdCertOverrideService.prototype.QueryInterface = function(aIID) {
+  if (aIID.equals(Components.interfaces.nsICertOverrideService) ||
+      aIID.equals(Components.interfaces.nsIInterfaceRequestor) ||
+      aIID.equals(Components.interfaces.nsISupports)) {
+    return this;
+  }
+
+  throw Components.results.NS_ERROR_NO_INTERFACE;
+}
+
 // Service contract ID which we override
 const CERTOVERRIDE_CONTRACT_ID = "@mozilla.org/security/certoverride;1";
 // UUID for this instance specifically.
-const DUMMY_BADCERT_SERVICE_CLASS_ID =
+const DUMMY_CERTOVERRIDE_SERVICE_CLASS_ID =
   Components.ID('{c8fffaba-9b7a-41aa-872d-7e7366c16715}');
 
 var service = undefined;
 
-var WDBadCertListenerFactory = {
+var WDCertOverrideFactory = {
   createInstance: function (aOuter, aIID) {
     if (aOuter != null)
       throw Components.results.NS_ERROR_NO_AGGREGATION;
@@ -154,7 +256,7 @@ WDBadCertListenerModule.prototype.registerSelf = function(
   aCompMgr = aCompMgr.QueryInterface(
       Components.interfaces.nsIComponentRegistrar);
   aCompMgr.registerFactoryLocation(
-      DUMMY_BADCERT_SERVICE_CLASS_ID, "WebDriver Override Cert Service",
+      DUMMY_CERTOVERRIDE_SERVICE_CLASS_ID, "WebDriver Override Cert Service",
       CERTOVERRIDE_CONTRACT_ID, aFileSpec, aLocation, aType);
 };
 
@@ -163,7 +265,7 @@ WDBadCertListenerModule.prototype.unregisterSelf = function(
   localdump("Un-registering Override Certificate service.");
   aCompMgr =
   aCompMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
-  aCompMgr.unregisterFactoryLocation(DUMMY_BADCERT_SERVICE_CLASS_ID, aLocation);
+  aCompMgr.unregisterFactoryLocation(DUMMY_CERTOVERRIDE_SERVICE_CLASS_ID, aLocation);
 };
 
 WDBadCertListenerModule.prototype.getClassObject = function(
@@ -171,8 +273,8 @@ WDBadCertListenerModule.prototype.getClassObject = function(
   if (!aIID.equals(Components.interfaces.nsIFactory))
     throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
 
-  if (aCID.equals(DUMMY_BADCERT_SERVICE_CLASS_ID))
-    return WDBadCertListenerFactory;
+  if (aCID.equals(DUMMY_CERTOVERRIDE_SERVICE_CLASS_ID))
+    return WDCertOverrideFactory;
 
   throw Components.results.NS_ERROR_NO_INTERFACE;
 };