selenium-webdriver 2.43.5 → 2.44.0

package/test/page_loading_test.js

@@ -17,6 +17,7 @@
 
 var By = require('..').By,
     ErrorCode = require('..').error.ErrorCode,
+    until = require('..').until,
     assert = require('../testing/assert'),
     test = require('../lib/test'),
     Browser = test.Browser,
@@ -24,8 +25,7 @@ var By = require('..').By,
 
 
 test.suite(function(env) {
-  var browsers = env.browsers,
-      waitForTitleToBe = env.waitForTitleToBe;
+  var browsers = env.browsers;
 
   var driver;
   beforeEach(function() { driver = env.driver; });
@@ -74,7 +74,7 @@ test.suite(function(env) {
     driver.get(Pages.formPage);
 
     driver.findElement(By.id('imageButton')).click();
-    waitForTitleToBe('We Arrive Here');
+    driver.wait(until.titleIs('We Arrive Here'), 5000);
 
     driver.navigate().back();
     assert(driver.getTitle()).equalTo('We Leave From Here');
@@ -85,7 +85,7 @@ test.suite(function(env) {
     driver.get(Pages.xhtmlTestPage);
 
     driver.findElement(By.name('sameWindow')).click();
-    waitForTitleToBe('This page has iframes');
+    driver.wait(until.titleIs('This page has iframes'), 5000);
 
     driver.navigate().back();
     assert(driver.getTitle()).equalTo('XHTML Test Page');
@@ -96,13 +96,13 @@ test.suite(function(env) {
     driver.get(Pages.formPage);
 
     driver.findElement(By.id('imageButton')).click();
-    waitForTitleToBe('We Arrive Here');
+    driver.wait(until.titleIs('We Arrive Here'), 5000);
 
     driver.navigate().back();
-    waitForTitleToBe('We Leave From Here');
+    driver.wait(until.titleIs('We Leave From Here'), 5000);
 
     driver.navigate().forward();
-    waitForTitleToBe('We Arrive Here');
+    driver.wait(until.titleIs('We Arrive Here'), 5000);
   });
 
   test.it('should be able to refresh a page', function() {

package/test/stale_element_test.js

@@ -19,6 +19,7 @@ var fail = require('assert').fail;
 
 var By = require('..').By,
     error = require('..').error,
+    until = require('..').until,
     assert = require('../testing/assert'),
     test = require('../lib/test'),
     Browser = test.Browser,
@@ -39,16 +40,7 @@ test.suite(function(env) {
         assert(toBeDeleted.isDisplayed()).isTrue();
 
         driver.findElement(By.id('delete')).click();
-        driver.wait(function() {
-          return toBeDeleted.isDisplayed().
-              then(function() { return false; }).
-              then(null, function(e) {
-                if (e.code === error.ErrorCode.STALE_ELEMENT_REFERENCE) {
-                  return true;
-                }
-                throw e;
-              });
-       }, 5000, 'Element should be stale at this point');
+        driver.wait(until.stalenessOf(toBeDeleted), 5000);
       });
 
   test.it('an element found in a different frame is stale', function() {

package/testing/index.js

@@ -30,40 +30,27 @@
  * <p>The provided wrappers leverage the {@link webdriver.promise.ControlFlow}
  * to simplify writing asynchronous tests:
  * <pre><code>
- * var webdriver = require('selenium-webdriver'),
- *     portprober = require('selenium-webdriver/net/portprober'),
- *     remote = require('selenium-webdriver/remote'),
+ * var By = require('selenium-webdriver').By,
+ *     until = require('selenium-webdriver').until,
+ *     firefox = require('selenium-webdriver/firefox'),
  *     test = require('selenium-webdriver/testing');
  *
  * test.describe('Google Search', function() {
- *   var driver, server;
+ *   var driver;
  *
  *   test.before(function() {
- *     server = new remote.SeleniumServer(
- *         'path/to/selenium-server-standalone.jar',
- *         {port: portprober.findFreePort()});
- *     server.start();
- *
- *     driver = new webdriver.Builder().
- *         withCapabilities({'browserName': 'firefox'}).
- *         usingServer(server.address()).
- *         build();
+ *     driver = new firefox.Driver();
  *   });
  *
  *   test.after(function() {
  *     driver.quit();
- *     server.stop();
  *   });
  *
  *   test.it('should append query to title', function() {
- *     driver.get('http://www.google.com');
- *     driver.findElement(webdriver.By.name('q')).sendKeys('webdriver');
- *     driver.findElement(webdriver.By.name('btnG')).click();
- *     driver.wait(function() {
- *       return driver.getTitle().then(function(title) {
- *         return 'webdriver - Google Search' === title;
- *       });
- *     }, 1000, 'Waiting for title to update');
+ *     driver.get('http://www.google.com/ncr');
+ *     driver.findElement(By.name('q')).sendKeys('webdriver');
+ *     driver.findElement(By.name('btnG')).click();
+ *     driver.wait(until.titleIs('webdriver - Google Search'), 1000);
  *   });
  * });
  * </code></pre>