RubyGems - selenium-webdriver - Versions diffs - 0.0.7 → 0.0.8 - Mend

selenium-webdriver 0.0.7 → 0.0.8

Files changed (27) hide show

data/chrome/src/extension/background.js +19 -14
data/chrome/src/extension/manifest-nonwin.json +1 -2
data/chrome/src/extension/manifest-win.json +1 -2
data/chrome/src/rb/lib/selenium/webdriver/chrome/bridge.rb +5 -1
data/common/src/js/abstractcommandprocessor.js +0 -33
data/common/src/js/asserts.js +2 -2
data/common/src/js/by.js +2 -0
data/common/src/js/command.js +130 -36
data/common/src/js/future.js +42 -23
data/common/src/js/localcommandprocessor.js +0 -1
data/common/src/js/testrunner.js +9 -16
data/common/src/js/webdriver.js +225 -254
data/common/src/js/webelement.js +76 -197
data/common/src/rb/lib/selenium/webdriver/driver.rb +4 -0
data/common/src/rb/lib/selenium/webdriver/element.rb +4 -0
data/firefox/src/extension/components/badCertListener.js +186 -0
data/firefox/src/extension/components/firefoxDriver.js +7 -16
data/firefox/src/extension/components/nsCommandProcessor.js +10 -9
data/firefox/src/extension/components/utils.js +5 -5
data/firefox/src/extension/components/webdriverserver.js +5 -0
data/firefox/src/extension/components/wrappedElement.js +10 -6
data/firefox/src/rb/lib/selenium/webdriver/firefox/bridge.rb +11 -12
data/firefox/src/rb/lib/selenium/webdriver/firefox/extension_connection.rb +2 -2
data/firefox/src/rb/lib/selenium/webdriver/firefox/profile.rb +2 -1
metadata +3 -4
data/chrome/src/extension/toolstrip.html +0 -28
data/common/src/js/wait.js +0 -199

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

@@ -48,11 +48,11 @@ HTTP
           command = {'commandName' => 'quit', 'context' => ''}
           send_string(command.to_json)
         ensure
-          @socket.close
+          close
         end
         def close
-          @socket.close
+          @socket.close if connected?
         end
         def read_response

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

@@ -21,7 +21,7 @@ module Selenium
         }
         attr_reader :name, :directory
-        attr_accessor :port
+        attr_accessor :port, :secure_ssl
         class << self
@@ -60,6 +60,7 @@ 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
           write_prefs prefs
         end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selenium-webdriver
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jari Bakken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-11-22 00:00:00 +01:00
+date: 2009-11-29 00:00:00 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -91,7 +91,6 @@ files:
 - common/src/js/logging.js
 - common/src/js/testrunner.js
 - common/src/js/timing.js
-- common/src/js/wait.js
 - common/src/js/webdriver.js
 - common/src/js/webelement.js
 - firefox/src/rb/lib/selenium/webdriver/firefox/binary.rb
@@ -103,6 +102,7 @@ files:
 - firefox/src/rb/lib/selenium/webdriver/firefox/util.rb
 - firefox/src/rb/lib/selenium/webdriver/firefox.rb
 - firefox/src/extension/chrome.manifest
+- firefox/src/extension/components/badCertListener.js
 - firefox/src/extension/components/context.js
 - firefox/src/extension/components/driver-component.js
 - firefox/src/extension/components/firefoxDriver.js
@@ -135,7 +135,6 @@ files:
 - chrome/src/extension/icons/free.png
 - chrome/src/extension/manifest-nonwin.json
 - chrome/src/extension/manifest-win.json
-- chrome/src/extension/toolstrip.html
 - chrome/src/extension/utils.js
 - chrome/prebuilt/Win32/Release/npchromedriver.dll
 - chrome/prebuilt/x64/Release/npchromedriver.dll

data/chrome/src/extension/toolstrip.html DELETED

@@ -1,28 +0,0 @@
-<html>
-<head>
-  <script type="text/javascript">
-  function setWebdriverToolstripBusy() {
-    document.getElementById("toolstripText").className = "toolstripTextBusy";
-  }
-  function setWebdriverToolstripFree() {
-    document.getElementById("toolstripText").className = "toolstripTextFree";
-  }
-  </script>
-  <style type="text/css">
-  .toolstripTextBusy {
-    color: red;
-  }
-  .toolstripTextFree {
-    color: black;
-  }
-  </style>
-</head>
-<body>
-  <div>
-    <span id="toolstripText" class="toolstripTextFree">WebDriver</span>
-  </div>
-</body>
-</html>

data/common/src/js/wait.js DELETED

@@ -1,199 +0,0 @@
-/** @license
-Copyright 2007-2009 WebDriver committers
-Copyright 2007-2009 Google Inc.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-     http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-/**
- * @fileoverview Defines a mechanism for blocking {@code webdriver.WebDriver}
- * command execution on user-defined conditions.
- * @author jmleyba@gmail.com (Jason Leyba)
- */
-goog.provide('webdriver.Wait');
-goog.require('goog.events');
-goog.require('webdriver.Future');
-goog.require('webdriver.timing');
-/**
- * Controls polling a condition that a {@code webdriver.WebDriver} instance
- * should block command execution on.
- * @param {function} conditionFn The condition function that the driver will
- *     poll. The function should require no arguments and return a boolean or a
- *     {@code webdriver.Future} that will evaluate to a boolean.
- * @param {number} timeout The amount of time to wait, in milliseconds, for the
- *     condition to hold.
- * @constructor
- * @private
- */
-webdriver.Wait = function(conditionFn, timeout) {
-  /**
-   * Function to call for evaluating the condition being waited on.
-   * @type {function: boolean}
-   * @private
-   */
-  this.conditionFn_ = conditionFn;
-  /**
-   * The maximum amount of time in milliseconds to wait for condition.
-   * @type {number}
-   * @private
-   */
-  this.timeout_ = timeout;
-  /**
-   * When the wait began. Set on the first call to {@code #start()}.
-   * @type {number}
-   * @private
-   */
-  this.started_ = 0;
-  /**
-   * ID of the timeout timer. Initialized on the first call to {@code #start()}.
-   * @type {number}
-   * @private
-   */
-  this.timeoutId_ = null;
-  /**
-   * ID of the interval timer. Initialized on the first call to
-   * {@code #start()}.
-   * @type {number}
-   * @private
-   */
-  this.pollingIntervalId_ = null;
-  /**
-   * Whether to wait on the inverse of the wait condition.
-   * @type {boolean}
-   * @private
-   */
-  this.waitOnInverse_ = false;
-};
-/**
- * Set this instance to wait for the inverse of its condition.
- * @param {boolean} wait Whether to wait for the inverse of the condition.
- */
-webdriver.Wait.prototype.waitOnInverse = function(wait) {
-  this.waitOnInverse_ = wait;
-};
-/**
- * Starts the timer the and starts evaluating the condition.
- * @param {function} callbackFn The function to call with the result. The
- *     function should take 3 arguments: a boolean for whether the wait timed
- *     out (will only be true on a timeout), the amount of time spent in the
- *     wait. The 3rd parameter will be an Error, if any, that caused the wait
- *     to abort early.
- */
-webdriver.Wait.prototype.start = function(callbackFn) {
-  if (!!!this.started_) {
-    this.started_ = goog.now();
-    var tickHandler = goog.bind(this.onTick_, this, callbackFn);
-    var timeoutHandler = goog.bind(this.onTimeout_, this, callbackFn);
-    this.pollingIntervalId_ = webdriver.timing.setInterval(tickHandler, 5);
-    this.timeoutId_ =
-        webdriver.timing.setTimeout(timeoutHandler, this.timeout_);
-    this.onTick_(callbackFn);
-  }
-};
-/**
- * Callback for when the wait times out.
- * @param {function} callbackFn The function to call with the result.
- * @private
- */
-webdriver.Wait.prototype.onTimeout_ = function(callbackFn) {
-  webdriver.timing.clearInterval(this.pollingIntervalId_);
-  if (this.pendingFuture_) {
-    this.pendingFuture_.dispose();
-  }
-  callbackFn(true, goog.now() - this.started_);
-};
-/**
- * Evaluates the wait condition and determines whether to abort the wait.
- * @param {function} callbackFn The function to call with the result.
- * @private
- */
-webdriver.Wait.prototype.onTick_ = function(callbackFn) {
-  if (this.pendingFuture_) {
-    return;
-  }
-  var elapsed = goog.now() - this.started_;
-  var value;
-  try {
-    value = this.conditionFn_();
-    if (value instanceof webdriver.Future) {
-      if (value.isSet() &&
-          this.checkValue_(value.getValue(), elapsed, callbackFn)) {
-        return;
-      }
-      this.pendingFuture_ = value;
-      goog.events.listenOnce(value, goog.events.EventType.CHANGE, function() {
-        this.pendingFuture_ = null;
-        this.checkValue_(value.getValue(), goog.now() - this.started_,
-            callbackFn);
-      }, false, this);
-    } else {
-      this.checkValue_(value, elapsed, callbackFn);
-    }
-  } catch (ex) {
-    webdriver.timing.clearInterval(this.pollingIntervalId_);
-    webdriver.timing.clearTimeout(this.timeoutId_);
-    if (this.pendingFuture_) {
-      this.pendingFuture_.dispose();
-    }
-    callbackFn(true, elapsed, ex);
-  }
-};
-/**
- * Checks the value returned by the condition function.
- * @param {boolean} value The result of the condition function.
- * @param {number} elapsed The time elapsed since the wait started.
- * @param {function} callbackFn The function to call with the result.
- * @private
- */
-webdriver.Wait.prototype.checkValue_ = function(value, elapsed, callbackFn) {
-  value = !!value;
-  if (this.waitOnInverse_) {
-    value = !value;
-  }
-  if (value) {
-    webdriver.timing.clearInterval(this.pollingIntervalId_);
-    webdriver.timing.clearTimeout(this.timeoutId_);
-    if (this.pendingFuture_) {
-      this.pendingFuture_.dispose();
-    }
-    callbackFn(false, elapsed);
-  }
-  return value;
-};