selenium-webdriver 3.3.0 → 4.0.0-alpha.1

package/test/remote_test.js

@@ -17,16 +17,14 @@
 
 'use strict';
 
-var assert = require('assert'),
-    fs = require('fs'),
-    path = require('path');
+const assert = require('assert');
+const fs = require('fs');
+const path = require('path');
 
-var promise = require('../').promise,
-    io = require('../io'),
-    cmd = require('../lib/command'),
-    remote = require('../remote');
-
-const {enablePromiseManager} = require('../lib/test/promise');
+const io = require('../io');
+const cmd = require('../lib/command');
+const remote = require('../remote');
+const {CancellationError} = require('../http/util');
 
 describe('DriverService', function() {
   describe('start()', function() {
@@ -44,28 +42,11 @@ describe('DriverService', function() {
     });
 
     it('fails if child-process dies', function() {
-      this.timeout(1000);
       return service.start(500).then(expectFailure, verifyFailure);
     });
 
-    enablePromiseManager(function() {
-      describe(
-          'failures propagate through control flow if child-process dies',
-          function() {
-            it('', function() {
-              this.timeout(1000);
-
-              return promise.controlFlow().execute(function() {
-                promise.controlFlow().execute(function() {
-                  return service.start(500);
-                });
-              }).then(expectFailure, verifyFailure);
-            });
-          });
-    });
-
     function verifyFailure(e) {
-      assert.ok(!(e instanceof promise.CancellationError));
+      assert.ok(!(e instanceof CancellationError));
       assert.equal('Server terminated early with status 1', e.message);
     }
 
@@ -77,13 +58,13 @@ describe('DriverService', function() {
 
 describe('FileDetector', function() {
   class ExplodingDriver {
-    schedule() {
+    execute() {
       throw Error('unexpected call');
     }
   }
 
   it('returns the original path if the file does not exist', function() {
-    return io.tmpDir(dir => {
+    return io.tmpDir().then(dir => {
       let theFile = path.join(dir, 'not-there');
       return (new remote.FileDetector)
           .handleFile(new ExplodingDriver, theFile)
@@ -92,7 +73,7 @@ describe('FileDetector', function() {
   });
 
   it('returns the original path if it is a directory', function() {
-    return io.tmpDir(dir => {
+    return io.tmpDir().then(dir => {
       return (new remote.FileDetector)
           .handleFile(new ExplodingDriver, dir)
           .then(f => assert.equal(f, dir));
@@ -100,11 +81,11 @@ describe('FileDetector', function() {
   });
 
   it('attempts to upload valid files', function() {
-    return io.tmpFile(theFile => {
+    return io.tmpFile().then(theFile => {
       return (new remote.FileDetector)
           .handleFile(
               new (class FakeDriver {
-                schedule(command) {
+                execute(command) {
                   assert.equal(command.getName(), cmd.Name.UPLOAD_FILE);
                   assert.equal(typeof command.getParameters()['file'], 'string');
                   return Promise.resolve('success!');

package/test/safari_test.js

@@ -17,75 +17,12 @@
 
 'use strict';
 
-const webdriver = require('..'),
-  proxy = require('../proxy'),
-  safari = require('../safari'),
-  assert = require('../testing/assert'),
-  test = require('../lib/test');
+const assert = require('assert');
 
+const safari = require('../safari');
+const test = require('../lib/test');
+const webdriver = require('..');
 
-describe('safari.Options', function() {
-  describe('fromCapabilities', function() {
-    it('returns a new Options instance  if none were defined', function() {
-      let options = safari.Options.fromCapabilities(
-        new webdriver.Capabilities());
-      assert(options).instanceOf(safari.Options);
-    });
-
-    it('returns the options instance if present', function() {
-      let options = new safari.Options().setCleanSession(true),
-        caps = options.toCapabilities();
-      assert(safari.Options.fromCapabilities(caps)).equalTo(options);
-    });
-
-    it('extracts supported WebDriver capabilities', function() {
-      let proxyPrefs = proxy.direct(),
-        logPrefs = {},
-        caps = webdriver.Capabilities.chrome()
-          .set(webdriver.Capability.PROXY, proxyPrefs)
-          .set(webdriver.Capability.LOGGING_PREFS, logPrefs);
-
-      let options = safari.Options.fromCapabilities(caps);
-      assert(options.proxy_).equalTo(proxyPrefs);
-      assert(options.logPrefs_).equalTo(logPrefs);
-    });
-  });
-
-  describe('toCapabilities', function() {
-    let options;
-
-    before(function() {
-      options = new safari.Options()
-        .setCleanSession(true);
-    });
-
-    it('returns a new capabilities object if one is not provided', function() {
-      let caps = options.toCapabilities();
-      assert(caps).instanceOf(webdriver.Capabilities);
-      assert(caps.get('browserName')).equalTo('safari');
-      assert(caps.get('safari.options')).equalTo(options);
-    });
-
-    it('adds to input capabilities object', function() {
-      let caps = webdriver.Capabilities.safari();
-      assert(options.toCapabilities(caps)).equalTo(caps);
-      assert(caps.get('safari.options')).equalTo(options);
-    });
-
-    it('sets generic driver capabilities', function() {
-      let proxyPrefs = proxy.direct(),
-        loggingPrefs = {};
-
-      options
-        .setLoggingPrefs(loggingPrefs)
-        .setProxy(proxyPrefs);
-
-      let caps = options.toCapabilities();
-      assert(caps.get('proxy')).equalTo(proxyPrefs);
-      assert(caps.get('loggingPrefs')).equalTo(loggingPrefs);
-    });
-  });
-});
 
 test.suite(function(env) {
   describe('safaridriver', function() {
@@ -97,12 +34,11 @@ test.suite(function(env) {
       }
     });
 
-    it('can start safaridriver', function() {
+    it('can start safaridriver', async function() {
       service = new safari.ServiceBuilder().build();
 
-      return service.start().then(function(url) {
-        assert(url).matches(/127\.0\.0\.1/);
-      });
+      let url = await service.start();
+      assert(/127\.0\.0\.1/.test(url), `unexpected url: ${url}`);
     });
   });
 }, {browsers: ['safari']});

package/test/stale_element_test.js

@@ -17,47 +17,44 @@
 
 'use strict';
 
-var fail = require('assert').fail;
+const assert = require('assert');
+const {fail} = require('assert');
 
-var Browser = require('..').Browser,
-    By = require('..').By,
-    error = require('..').error,
-    until = require('..').until,
-    assert = require('../testing/assert'),
-    test = require('../lib/test'),
-    Pages = test.Pages;
+const test = require('../lib/test');
+const {Browser, By, error, until} = require('..');
+const Pages = test.Pages;
 
 
 test.suite(function(env) {
   var driver;
-  test.before(function*() { driver = yield env.builder().build(); });
-  test.after(function() { return driver.quit(); });
+  before(async function() { driver = await env.builder().build(); });
+  after(function() { return driver.quit(); });
 
   // Element never goes stale in Safari.
   test.ignore(env.browsers(Browser.SAFARI)).
   it(
       'dynamically removing elements from the DOM trigger a ' +
           'StaleElementReferenceError',
-      function*() {
-        yield driver.get(Pages.javascriptPage);
+      async function() {
+        await driver.get(Pages.javascriptPage);
 
-        var toBeDeleted = yield driver.findElement(By.id('deleted'));
-        yield assert(toBeDeleted.getTagName()).isEqualTo('p');
+        var toBeDeleted = await driver.findElement(By.id('deleted'));
+        assert.equal(await toBeDeleted.getTagName(), 'p');
 
-        yield driver.findElement(By.id('delete')).click();
-        yield driver.wait(until.stalenessOf(toBeDeleted), 5000);
+        await driver.findElement(By.id('delete')).click();
+        await driver.wait(until.stalenessOf(toBeDeleted), 5000);
       });
 
-  test.it('an element found in a different frame is stale', function*() {
-    yield driver.get(Pages.missedJsReferencePage);
+  it('an element found in a different frame is stale', async function() {
+    await driver.get(Pages.missedJsReferencePage);
 
-    var frame = yield driver.findElement(By.css('iframe[name="inner"]'));
-    yield driver.switchTo().frame(frame);
+    var frame = await driver.findElement(By.css('iframe[name="inner"]'));
+    await driver.switchTo().frame(frame);
 
-    var el = yield driver.findElement(By.id('oneline'));
-    yield driver.switchTo().defaultContent();
+    var el = await driver.findElement(By.id('oneline'));
+    await driver.switchTo().defaultContent();
     return el.getText().then(fail, function(e) {
-      assert(e).instanceOf(error.StaleElementReferenceError);
+      assert.ok(e instanceof error.StaleElementReferenceError);
     });
   });
 });

package/test/tag_name_test.js

@@ -17,20 +17,21 @@
 
 'use strict';
 
-var By = require('..').By,
-    assert = require('../testing/assert'),
-    test = require('../lib/test');
+const assert = require('assert');
+
+const test = require('../lib/test');
+const {By} = require('..');
 
 
 test.suite(function(env) {
   var driver;
-  test.after(function() { return driver.quit(); });
+  after(function() { return driver.quit(); });
 
-  test.it('should return lower case tag name', function*() {
-    driver = yield env.builder().build();
-    yield driver.get(test.Pages.formPage);
+  it('should return lower case tag name', async function() {
+    driver = await env.builder().build();
+    await driver.get(test.Pages.formPage);
 
-    let el = yield driver.findElement(By.id('cheese'));
-    return assert(el.getTagName()).equalTo('input');
+    let el = await driver.findElement(By.id('cheese'));
+    assert.equal(await el.getTagName(), 'input');
   });
 });

package/test/upload_test.js

@@ -17,23 +17,22 @@
 
 'use strict';
 
-var fs = require('fs');
+const assert = require('assert');
+const fs = require('fs');
 
-var Browser = require('..').Browser,
-    By = require('..').By,
-    until = require('..').until,
-    io = require('../io'),
-    remote = require('../remote'),
-    assert = require('../testing/assert'),
-    test = require('../lib/test'),
-    Pages = test.Pages;
+const io = require('../io');
+const remote = require('../remote');
+const test = require('../lib/test');
+const {Browser, By, until} = require('..');
+
+const Pages = test.Pages;
 
 test.suite(function(env) {
   var LOREM_IPSUM_TEXT = 'lorem ipsum dolor sit amet';
   var FILE_HTML = '<!DOCTYPE html><div>' + LOREM_IPSUM_TEXT + '</div>';
 
   var fp;
-  test.before(function() {
+  before(function() {
     return fp = io.tmpFile().then(function(fp) {
       fs.writeFileSync(fp, FILE_HTML);
       return fp;
@@ -41,46 +40,39 @@ test.suite(function(env) {
   })
 
   var driver;
-  test.before(function*() {
-    driver = yield env.builder().build();
+  before(async function() {
+    driver = await env.builder().build();
   });
 
-  test.after(function() {
+  after(function() {
     if (driver) {
       return driver.quit();
     }
   });
 
-  test.ignore(env.browsers(
-      Browser.IPAD,
-      Browser.IPHONE,
-      // Uploads broken in PhantomJS 2.0.
-      // See https://github.com/ariya/phantomjs/issues/12506
-      Browser.PHANTOM_JS,
-      Browser.SAFARI)).
-  it('can upload files', function*() {
+  test.ignore(env.browsers(Browser.SAFARI)).
+  it('can upload files', async function() {
     driver.setFileDetector(new remote.FileDetector);
 
-    yield driver.get(Pages.uploadPage);
+    await driver.get(Pages.uploadPage);
 
-    var fp = yield driver.call(function() {
-      return io.tmpFile().then(function(fp) {
-        fs.writeFileSync(fp, FILE_HTML);
-        return fp;
-      });
+    var fp = await io.tmpFile().then(function(fp) {
+      fs.writeFileSync(fp, FILE_HTML);
+      return fp;
     });
 
-    yield driver.findElement(By.id('upload')).sendKeys(fp);
-    yield driver.findElement(By.id('go')).click();
+    await driver.findElement(By.id('upload')).sendKeys(fp);
+    await driver.findElement(By.id('go')).click();
 
     // Uploading files across a network may take a while, even if they're small.
-    var label = yield driver.findElement(By.id('upload_label'));
-    yield driver.wait(until.elementIsNotVisible(label),
+    var label = await driver.findElement(By.id('upload_label'));
+    await driver.wait(until.elementIsNotVisible(label),
         10 * 1000, 'File took longer than 10 seconds to upload!');
 
-    var frame = yield driver.findElement(By.id('upload_target'));
-    yield driver.switchTo().frame(frame);
-    yield assert(driver.findElement(By.css('body')).getText())
-        .equalTo(LOREM_IPSUM_TEXT);
+    var frame = await driver.findElement(By.id('upload_target'));
+    await driver.switchTo().frame(frame);
+    assert.equal(
+        await driver.findElement(By.css('body')).getText(),
+        LOREM_IPSUM_TEXT);
   });
 });

package/test/window_test.js

@@ -17,128 +17,115 @@
 
 'use strict';
 
-var Browser = require('..').Browser,
-    By = require('..').By,
-    assert = require('../testing/assert'),
-    test = require('../lib/test');
+const assert = require('assert');
+
+const test = require('../lib/test');
+const {Browser, By} = require('..');
 
 
 test.suite(function(env) {
   var driver;
 
-  test.before(function*() { driver = yield env.builder().build(); });
-  test.after(function() { return driver.quit(); });
+  before(async function() { driver = await env.builder().build(); });
+  after(function() { return driver.quit(); });
 
-  test.beforeEach(function() {
+  beforeEach(function() {
     return driver.switchTo().defaultContent();
   });
 
-  test.it('can set size of the current window', function*() {
-    yield driver.get(test.Pages.echoPage);
-    yield changeSizeBy(-20, -20);
+  it('can set size of the current window', async function() {
+    await driver.get(test.Pages.echoPage);
+    await changeSizeBy(-20, -20);
   });
 
-  test.it('can set size of the current window from frame', function*() {
-    yield driver.get(test.Pages.framesetPage);
+  it('can set size of the current window from frame', async function() {
+    await driver.get(test.Pages.framesetPage);
 
-    var frame = yield driver.findElement({css: 'frame[name="fourth"]'});
-    yield driver.switchTo().frame(frame);
-    yield changeSizeBy(-20, -20);
+    var frame = await driver.findElement({css: 'frame[name="fourth"]'});
+    await driver.switchTo().frame(frame);
+    await changeSizeBy(-20, -20);
   });
 
-  test.it('can set size of the current window from iframe', function*() {
-    yield driver.get(test.Pages.iframePage);
+  it('can set size of the current window from iframe', async function() {
+    await driver.get(test.Pages.iframePage);
 
-    var frame = yield driver.findElement({css: 'iframe[name="iframe1-name"]'});
-    yield driver.switchTo().frame(frame);
-    yield changeSizeBy(-20, -20);
+    var frame = await driver.findElement({css: 'iframe[name="iframe1-name"]'});
+    await driver.switchTo().frame(frame);
+    await changeSizeBy(-20, -20);
   });
 
-  test.it('can switch to a new window', function*() {
-    yield driver.get(test.Pages.xhtmlTestPage);
+  it('can switch to a new window', async function() {
+    await driver.get(test.Pages.xhtmlTestPage);
 
-    let handle = yield driver.getWindowHandle();
-    let originalHandles = yield driver.getAllWindowHandles();
+    let handle = await driver.getWindowHandle();
+    let originalHandles = await driver.getAllWindowHandles();
 
-    yield driver.findElement(By.linkText("Open new window")).click();
-    yield driver.wait(forNewWindowToBeOpened(originalHandles), 2000);
-    yield assert(driver.getTitle()).equalTo("XHTML Test Page");
+    await driver.findElement(By.linkText("Open new window")).click();
+    await driver.wait(forNewWindowToBeOpened(originalHandles), 2000);
+    assert.equal(await driver.getTitle(), "XHTML Test Page");
 
-    let newHandle = yield getNewWindowHandle(originalHandles);
+    let newHandle = await getNewWindowHandle(originalHandles);
 
-    yield driver.switchTo().window(newHandle);
-    yield assert(driver.getTitle()).equalTo("We Arrive Here");
+    await driver.switchTo().window(newHandle);
+    assert.equal(await driver.getTitle(), "We Arrive Here");
   });
 
-  test.it('can set the window position of the current window', function*() {
-    let position = yield driver.manage().window().getPosition();
-
-    yield driver.manage().window().setSize(640, 480);
-    yield driver.manage().window().setPosition(position.x + 10, position.y + 10);
-
-    // For phantomjs, setPosition is a no-op and the "window" stays at (0, 0)
-    if (env.currentBrowser() === Browser.PHANTOM_JS) {
-      position = yield driver.manage().window().getPosition();
-      assert(position.x).equalTo(0);
-      assert(position.y).equalTo(0);
-    } else {
-      var dx = position.x + 10;
-      var dy = position.y + 10;
-      return driver.wait(forPositionToBe(dx, dy), 1000);
-    }
+  it('can set the window position of the current window', async function() {
+    let {x, y} = await driver.manage().window().getRect();
+    let newX = x + 10;
+    let newY = y + 10;
+
+    await driver.manage().window().setRect({
+      x: newX,
+      y: newY,
+      width: 640,
+      height: 480
+    });
+
+    return driver.wait(forPositionToBe(newX, newY), 1000);
   });
 
-  test.it('can set the window position from a frame', function*() {
-    yield driver.get(test.Pages.iframePage);
+  it('can set the window position from a frame', async function() {
+    await driver.get(test.Pages.iframePage);
 
-    let frame = yield driver.findElement(By.name('iframe1-name'));
-    yield driver.switchTo().frame(frame);
+    let frame = await driver.findElement(By.name('iframe1-name'));
+    await driver.switchTo().frame(frame);
 
-    let position = yield driver.manage().window().getPosition();
-    yield driver.manage().window().setSize(640, 480);
-    yield driver.manage().window().setPosition(position.x + 10, position.y + 10);
+    let {x, y} = await driver.manage().window().getRect();
+    x += 10;
+    y += 10;
 
-    // For phantomjs, setPosition is a no-op and the "window" stays at (0, 0)
-    if (env.currentBrowser() === Browser.PHANTOM_JS) {
-      return driver.manage().window().getPosition().then(function(position) {
-        assert(position.x).equalTo(0);
-        assert(position.y).equalTo(0);
-      });
-    } else {
-      var dx = position.x + 10;
-      var dy = position.y + 10;
-      return driver.wait(forPositionToBe(dx, dy), 1000);
-    }
+    await driver.manage().window().setRect({width: 640, height: 480, x, y});
+    return driver.wait(forPositionToBe(x, y), 1000);
   });
 
-  function changeSizeBy(dx, dy) {
-    return driver.manage().window().getSize().then(function(size) {
-      return driver.manage().window()
-          .setSize(size.width + dx, size.height + dy)
-          .then(_ => {
-            return driver.wait(
-                forSizeToBe(size.width + dx, size.height + dy), 1000);
-          });
-    });
+  async function changeSizeBy(dx, dy) {
+    let {width, height} = await driver.manage().window().getRect();
+    width += dx;
+    height += dy;
+
+    let rect = await driver.manage().window().setRect({width, height});
+    if (rect.width === width && rect.height === height) {
+      return;
+    }
+    return driver.wait(forSizeToBe(width, height), 1000);
   }
 
   function forSizeToBe(w, h) {
-    return function() {
-      return driver.manage().window().getSize().then(function(size) {
-        return size.width === w && size.height === h;
-      });
+    return async function() {
+      let {width, height} = await driver.manage().window().getRect();
+      return width === w && height === h;
     };
   }
 
   function forPositionToBe(x, y) {
-    return function() {
-      return driver.manage().window().getPosition().then(function(position) {
-        return position.x === x &&
-            // On OSX, the window height may be bumped down 22px for the top
-            // status bar.
-            // On Linux, Opera's window position will be off by 28px.
-           (position.y >= y && position.y <= (y + 28));
-      });
+    return async function() {
+      let position = await driver.manage().window().getRect();
+      return position.x === x &&
+          // On OSX, the window height may be bumped down 22px for the top
+          // status bar.
+          // On Linux, Opera's window position will be off by 28px.
+         (position.y >= y && position.y <= (y + 28));
     };
   }