selenium-webdriver 3.6.0 → 4.0.0-alpha.1

package/test/lib/webdriver_test.js

@@ -17,76 +17,33 @@
 
 'use strict';
 
-const testutil = require('./testutil');
+const {StubError, assertIsInstance, assertIsStubError, throwStubError} =
+    require('./testutil');
 
-const By = require('../../lib/by').By;
-const Capabilities = require('../../lib/capabilities').Capabilities;
-const Executor = require('../../lib/command').Executor;
-const CName = require('../../lib/command').Name;
 const error = require('../../lib/error');
-const Button = require('../../lib/input').Button;
-const Key = require('../../lib/input').Key;
 const logging = require('../../lib/logging');
-const Session = require('../../lib/session').Session;
 const promise = require('../../lib/promise');
-const {enablePromiseManager, promiseManagerSuite} = require('../../lib/test/promise');
 const until = require('../../lib/until');
-const Alert = require('../../lib/webdriver').Alert;
-const AlertPromise = require('../../lib/webdriver').AlertPromise;
-const UnhandledAlertError = require('../../lib/webdriver').UnhandledAlertError;
-const WebDriver = require('../../lib/webdriver').WebDriver;
-const WebElement = require('../../lib/webdriver').WebElement;
-const WebElementPromise = require('../../lib/webdriver').WebElementPromise;
+const {Alert, AlertPromise, WebDriver, WebElement, WebElementPromise} =
+    require('../../lib/webdriver');
+const {Button, Key} = require('../../lib/input');
+const {By} = require('../../lib/by');
+const {Capabilities} = require('../../lib/capabilities');
+const {Executor, Name} = require('../../lib/command');
+const {Session} = require('../../lib/session');
 
 const assert = require('assert');
 const sinon = require('sinon');
 
-const SESSION_ID = 'test_session_id';
+const CName = Name;
 
-// Aliases for readability.
-const NativePromise = Promise;
-const StubError = testutil.StubError;
-const assertIsInstance = testutil.assertIsInstance;
-const assertIsStubError = testutil.assertIsStubError;
-const throwStubError = testutil.throwStubError;
+const SESSION_ID = 'test_session_id';
 const fail = (msg) => assert.fail(msg);
 
 describe('WebDriver', function() {
   const LOG = logging.getLogger('webdriver.test');
 
-  // before(function() {
-  //   logging.getLogger('webdriver').setLevel(logging.Level.ALL);
-  //   logging.installConsoleHandler();
-  // });
-
-  // after(function() {
-  //   logging.getLogger('webdriver').setLevel(null);
-  //   logging.removeConsoleHandler();
-  // });
-
   var driver;
-  var flow;
-  var uncaughtExceptions;
-
-  beforeEach(function setUp() {
-    flow = promise.controlFlow();
-    uncaughtExceptions = [];
-    flow.on('uncaughtException', onUncaughtException);
-  });
-
-  afterEach(function tearDown() {
-    if (!promise.USE_PROMISE_MANAGER) {
-      return;
-    }
-    return waitForIdle(flow).then(function() {
-      assert.deepEqual([], uncaughtExceptions);
-      flow.reset();
-    });
-  });
-
-  function onUncaughtException(e) {
-    uncaughtExceptions.push(e);
-  }
 
   function defer() {
     let d = {};
@@ -97,43 +54,6 @@ describe('WebDriver', function() {
     return d;
   }
 
-  function waitForIdle(opt_flow) {
-    if (!promise.USE_PROMISE_MANAGER) {
-      return Promise.resolve();
-    }
-    var theFlow = opt_flow || flow;
-    return new Promise(function(fulfill, reject) {
-      if (theFlow.isIdle()) {
-        fulfill();
-        return;
-      }
-      theFlow.once('idle', fulfill);
-      theFlow.once('uncaughtException', reject);
-    });
-  }
-
-  function waitForAbort(opt_flow, opt_n) {
-    var n = opt_n || 1;
-    var theFlow = opt_flow || flow;
-    theFlow.removeAllListeners(
-        promise.ControlFlow.EventType.UNCAUGHT_EXCEPTION);
-    return new Promise(function(fulfill, reject) {
-      theFlow.once('idle', function() {
-        reject(Error('expected flow to report an unhandled error'));
-      });
-
-      var errors = [];
-      theFlow.on('uncaughtException', onError);
-      function onError(e) {
-        errors.push(e);
-        if (errors.length === n) {
-          theFlow.removeListener('uncaughtException', onError);
-          fulfill(n === 1 ? errors[0] : errors);
-        }
-      }
-    });
-  }
-
   function expectedError(ctor, message) {
     return function(e) {
       assertIsInstance(ctor, e);
@@ -210,7 +130,7 @@ describe('WebDriver', function() {
     }
 
     execute(command) {
-      assert.deepEqual(this.parameters_, command.getParameters());
+      assert.deepEqual(command.getParameters(), this.parameters_);
       return this.toDo_(command);
     }
   }
@@ -261,87 +181,16 @@ describe('WebDriver', function() {
   /////////////////////////////////////////////////////////////////////////////
 
 
-  describe('testAttachToSession', function() {
-    it('sessionIsAvailable', function() {
-      let aSession = new Session(SESSION_ID, {'browserName': 'firefox'});
-      let executor = new FakeExecutor().
-          expect(CName.DESCRIBE_SESSION).
-          withParameters({'sessionId': SESSION_ID}).
-          andReturnSuccess(aSession).
-          end();
-
-      let driver = WebDriver.attachToSession(executor, SESSION_ID);
-      return driver.getSession().then(v => assert.strictEqual(v, aSession));
-    });
-
-    it('failsToGetSessionInfo', function() {
-      let e = new Error('boom');
-      let executor = new FakeExecutor().
-          expect(CName.DESCRIBE_SESSION).
-          withParameters({'sessionId': SESSION_ID}).
-          andReturnError(e).
-          end();
-
-      let driver = WebDriver.attachToSession(executor, SESSION_ID);
-      return driver.getSession()
-          .then(() => assert.fail('should have failed!'),
-                (actual) => assert.strictEqual(actual, e));
-    });
-
-    it('remote end does not recognize DESCRIBE_SESSION command', function() {
-      let e = new error.UnknownCommandError;
-      let executor = new FakeExecutor().
-          expect(CName.DESCRIBE_SESSION).
-          withParameters({'sessionId': SESSION_ID}).
-          andReturnError(e).
-          end();
-
-      let driver = WebDriver.attachToSession(executor, SESSION_ID);
-      return driver.getSession().then(session => {
-        assert.ok(session instanceof Session);
-        assert.strictEqual(session.getId(), SESSION_ID);
-        assert.equal(session.getCapabilities().size, 0);
-      });
-    });
-
-    it('usesActiveFlowByDefault', function() {
-      let executor = new FakeExecutor().
-          expect(CName.DESCRIBE_SESSION).
-          withParameters({'sessionId': SESSION_ID}).
-          andReturnSuccess({}).
-          end();
-
-      var driver = WebDriver.attachToSession(executor, SESSION_ID);
-      assert.equal(driver.controlFlow(), promise.controlFlow());
-
-      return waitForIdle(driver.controlFlow());
-    });
-
-    enablePromiseManager(() => {
-      it('canAttachInCustomFlow', function() {
-        let executor = new FakeExecutor().
-            expect(CName.DESCRIBE_SESSION).
-            withParameters({'sessionId': SESSION_ID}).
-            andReturnSuccess({}).
-            end();
-
-        var otherFlow = new promise.ControlFlow();
-        var driver = WebDriver.attachToSession(executor, SESSION_ID, otherFlow);
-        assert.equal(otherFlow, driver.controlFlow());
-        assert.notEqual(otherFlow, promise.controlFlow());
-
-        return waitForIdle(otherFlow);
-      });
-    });
-  });
-
   describe('testCreateSession', function() {
     it('happyPathWithCapabilitiesHashObject', function() {
       let aSession = new Session(SESSION_ID, {'browserName': 'firefox'});
       let executor = new FakeExecutor().
           expect(CName.NEW_SESSION).
           withParameters({
-            'desiredCapabilities': {'browserName': 'firefox'}
+            'desiredCapabilities': {'browserName': 'firefox'},
+            'capabilities': {
+              'alwaysMatch': {'browserName': 'firefox'},
+            },
           }).
           andReturnSuccess(aSession).
           end();
@@ -356,7 +205,12 @@ describe('WebDriver', function() {
       let aSession = new Session(SESSION_ID, {'browserName': 'firefox'});
       let executor = new FakeExecutor().
           expect(CName.NEW_SESSION).
-          withParameters({'desiredCapabilities': {'browserName': 'firefox'}}).
+          withParameters({
+            'desiredCapabilities': {'browserName': 'firefox'},
+            'capabilities': {
+              'alwaysMatch': {'browserName': 'firefox'},
+            },
+          }).
           andReturnSuccess(aSession).
           end();
 
@@ -364,27 +218,35 @@ describe('WebDriver', function() {
       return driver.getSession().then(v => assert.strictEqual(v, aSession));
     });
 
-    it('handles desired and required capabilities', function() {
+    it('drops non-W3C capability names from W3C capabilities', function() {
       let aSession = new Session(SESSION_ID, {'browserName': 'firefox'});
       let executor = new FakeExecutor().
           expect(CName.NEW_SESSION).
           withParameters({
-            'desiredCapabilities': {'foo': 'bar'},
-            'requiredCapabilities': {'bim': 'baz'}
+            'desiredCapabilities': {'browserName': 'firefox', 'foo': 'bar'},
+            'capabilities': {
+              'alwaysMatch': {'browserName': 'firefox'},
+            },
           }).
           andReturnSuccess(aSession).
           end();
 
-      let desired = new Capabilities().set('foo', 'bar');
-      let required = new Capabilities().set('bim', 'baz');
-      var driver = WebDriver.createSession(executor, {desired, required});
+      var driver = WebDriver.createSession(executor, {
+        'browserName': 'firefox',
+        'foo': 'bar',
+      });
       return driver.getSession().then(v => assert.strictEqual(v, aSession));
     });
 
     it('failsToCreateSession', function() {
       let executor = new FakeExecutor().
           expect(CName.NEW_SESSION).
-          withParameters({'desiredCapabilities': {'browserName': 'firefox'}}).
+          withParameters({
+            'desiredCapabilities': {'browserName': 'firefox'},
+            'capabilities': {
+              'alwaysMatch': {'browserName': 'firefox'},
+            },
+          }).
           andReturnError(new StubError()).
           end();
 
@@ -397,78 +259,23 @@ describe('WebDriver', function() {
       let called = false;
       let executor = new FakeExecutor()
           .expect(CName.NEW_SESSION)
-          .withParameters({'desiredCapabilities': {'browserName': 'firefox'}})
+          .withParameters({
+            'desiredCapabilities': {'browserName': 'firefox'},
+            'capabilities': {
+              'alwaysMatch': {'browserName': 'firefox'},
+            },
+          })
           .andReturnError(new StubError())
           .end();
 
-      var driver =
-          WebDriver.createSession(executor, {'browserName': 'firefox'},
-              null, () => called = true);
+      let driver =
+          WebDriver.createSession(
+              executor, {'browserName': 'firefox'}, () => called = true);
       return driver.getSession().then(fail, err => {
         assert.ok(called);
         assertIsStubError(err);
       });
     });
-
-    it('usesActiveFlowByDefault', function() {
-      let executor = new FakeExecutor().
-          expect(CName.NEW_SESSION).
-          withParameters({'desiredCapabilities': {}}).
-          andReturnSuccess(new Session(SESSION_ID)).
-          end();
-
-      var driver = WebDriver.createSession(executor, {});
-      assert.equal(promise.controlFlow(), driver.controlFlow());
-
-      return waitForIdle(driver.controlFlow());
-    });
-
-    enablePromiseManager(() => {
-      it('canCreateInCustomFlow', function() {
-        let executor = new FakeExecutor().
-            expect(CName.NEW_SESSION).
-            withParameters({'desiredCapabilities': {}}).
-            andReturnSuccess({}).
-            end();
-
-        var otherFlow = new promise.ControlFlow();
-        var driver = WebDriver.createSession(executor, {}, otherFlow);
-        assert.equal(otherFlow, driver.controlFlow());
-        assert.notEqual(otherFlow, promise.controlFlow());
-
-        return waitForIdle(otherFlow);
-      });
-
-      describe('creation failures bubble up in control flow', function() {
-        function runTest(...args) {
-          let executor = new FakeExecutor()
-              .expect(CName.NEW_SESSION)
-              .withParameters({'desiredCapabilities': {'browserName': 'firefox'}})
-              .andReturnError(new StubError())
-              .end();
-
-          WebDriver.createSession(
-              executor, {'browserName': 'firefox'}, ...args);
-          return waitForAbort().then(assertIsStubError);
-        }
-
-        it('no onQuit callback', () => runTest());
-        it('has onQuit callback', () => runTest(null, null, function() {}));
-
-        it('onQuit callback failure suppress creation failure', function() {
-          let e = new Error('hi!');
-          let executor = new FakeExecutor()
-              .expect(CName.NEW_SESSION)
-              .withParameters({'desiredCapabilities': {'browserName': 'firefox'}})
-              .andReturnError(new StubError())
-              .end();
-
-          WebDriver.createSession(
-              executor, {'browserName': 'firefox'}, null, () => {throw e});
-          return waitForAbort().then(err => assert.strictEqual(err, e));
-        });
-      });
-    });
   });
 
   it('testDoesNotExecuteCommandIfSessionDoesNotResolve', function() {
@@ -506,26 +313,6 @@ describe('WebDriver', function() {
             v => assert.strictEqual(v, e));
   });
 
-  it('testCanSuppressCommandFailures', function() {
-    let e = new error.NoSuchWindowError('window not found');
-    let executor = new FakeExecutor().
-        expect(CName.SWITCH_TO_WINDOW).
-            withParameters({
-              'name': 'foo',
-              'handle': 'foo'
-            }).
-            andReturnError(e).
-        expect(CName.GET_TITLE).
-            andReturnSuccess('Google Search').
-        end();
-
-    var driver = executor.createDriver();
-    driver.switchTo().window('foo')
-        .catch(v => assert.strictEqual(v, e));
-    driver.getTitle();
-    return waitForIdle();
-  });
-
   it('testErrorsPropagateUpToTheRunningApplication', function() {
     let e = new error.NoSuchWindowError('window not found');
     let executor = new FakeExecutor().
@@ -589,53 +376,6 @@ describe('WebDriver', function() {
         .then(assert.fail, verifyError);
   });
 
-  it('testCallbackCommandsExecuteBeforeNextCommand', function() {
-    let executor = new FakeExecutor().
-        expect(CName.GET_CURRENT_URL).
-        expect(CName.GET, {'url': 'http://www.google.com'}).
-        expect(CName.CLOSE).
-        expect(CName.GET_TITLE).
-        end();
-
-    var driver = executor.createDriver();
-    driver.getCurrentUrl().then(function() {
-      driver.get('http://www.google.com').then(function() {
-        driver.close();
-      });
-    });
-    driver.getTitle();
-
-    return waitForIdle();
-  });
-
-  enablePromiseManager(() => {
-    it('testEachCallbackFrameRunsToCompletionBeforeTheNext', function() {
-      let executor = new FakeExecutor().
-          expect(CName.GET_TITLE).
-          expect(CName.GET_CURRENT_URL).
-          expect(CName.GET_CURRENT_WINDOW_HANDLE).
-          expect(CName.CLOSE).
-          expect(CName.QUIT).
-          end();
-
-      var driver = executor.createDriver();
-      driver.getTitle().
-          // Everything in this callback...
-          then(function() {
-            driver.getCurrentUrl();
-            driver.getWindowHandle();
-          }).
-          // ...should execute before everything in this callback.
-          then(function() {
-            driver.close();
-          });
-      // This should execute after everything above
-      driver.quit();
-
-      return waitForIdle();
-    });
-  });
-
   describe('returningAPromise', function() {
     it('fromACallback', function() {
       let executor = new FakeExecutor().
@@ -675,274 +415,6 @@ describe('WebDriver', function() {
     });
   });
 
-  describe('customFunctions', function() {
-    it('returnsANonPromiseValue', function() {
-      var driver = new FakeExecutor().createDriver();
-      return driver.call(() => 'abc123').then(function(value) {
-        assert.equal('abc123', value);
-      });
-    });
-
-    enablePromiseManager(() => {
-      it('executionOrderWithCustomFunctions', function() {
-        var msg = [];
-        let executor = new FakeExecutor().
-            expect(CName.GET_TITLE).andReturnSuccess('cheese ').
-            expect(CName.GET_CURRENT_URL).andReturnSuccess('tasty').
-            end();
-
-        var driver = executor.createDriver();
-
-        var pushMsg = msg.push.bind(msg);
-        driver.getTitle().then(pushMsg);
-        driver.call(() => 'is ').then(pushMsg);
-        driver.getCurrentUrl().then(pushMsg);
-        driver.call(() => '!').then(pushMsg);
-
-        return waitForIdle().then(function() {
-          assert.equal('cheese is tasty!', msg.join(''));
-        });
-      });
-    });
-
-    it('passingArgumentsToACustomFunction', function() {
-      var add = function(a, b) {
-        return a + b;
-      };
-      var driver = new FakeExecutor().createDriver();
-      return driver.call(add, null, 1, 2).then(function(value) {
-        assert.equal(3, value);
-      });
-    });
-
-    it('passingPromisedArgumentsToACustomFunction', function() {
-      var promisedArg = Promise.resolve(2);
-      var add = function(a, b) {
-        return a + b;
-      };
-      var driver = new FakeExecutor().createDriver();
-      return driver.call(add, null, 1, promisedArg).then(function(value) {
-        assert.equal(3, value);
-      });
-    });
-
-    it('passingArgumentsAndScopeToACustomFunction', function() {
-      function Foo(name) {
-        this.name = name;
-      }
-      Foo.prototype.getName = function() {
-        return this.name;
-      };
-      var foo = new Foo('foo');
-
-      var driver = new FakeExecutor().createDriver();
-      return driver.call(foo.getName, foo).then(function(value) {
-        assert.equal('foo', value);
-      });
-    });
-
-    it('customFunctionThrowsAnError', function() {
-      var driver = new FakeExecutor().createDriver();
-      return driver.call(throwStubError).then(fail, assertIsStubError);
-    });
-
-    it('customFunctionSchedulesCommands', function() {
-      let executor = new FakeExecutor().
-          expect(CName.GET_TITLE).
-          expect(CName.CLOSE).
-          expect(CName.QUIT).
-          end();
-
-      var driver = executor.createDriver();
-      driver.call(function() {
-        driver.getTitle();
-        driver.close();
-      });
-      driver.quit();
-      return waitForIdle();
-    });
-
-    it('returnsATaskResultAfterSchedulingAnother', function() {
-      let executor = new FakeExecutor().
-          expect(CName.GET_TITLE).
-              andReturnSuccess('Google Search').
-          expect(CName.CLOSE).
-          end();
-
-      var driver = executor.createDriver();
-      return driver.call(function() {
-        var title = driver.getTitle();
-        driver.close();
-        return title;
-      }).then(function(title) {
-        assert.equal('Google Search', title);
-      });
-    });
-
-    it('hasANestedCommandThatFails', function() {
-      let executor = new FakeExecutor().
-          expect(CName.SWITCH_TO_WINDOW, {
-            'name': 'foo',
-            'handle': 'foo'
-          }).
-          andReturnError(new StubError()).
-          end();
-
-      var driver = executor.createDriver();
-      return driver.call(function() {
-        return driver.switchTo().window('foo');
-      }).then(fail, assertIsStubError);
-    });
-
-    enablePromiseManager(() => {
-      it('doesNotCompleteUntilReturnedPromiseIsResolved', function() {
-        var order = [];
-        var driver = new FakeExecutor().createDriver();
-
-        var d = promise.defer();
-        d.promise.then(function() {
-          order.push('b');
-        });
-
-        driver.call(function() {
-          order.push('a');
-          return d.promise;
-        });
-        driver.call(function() {
-          order.push('c');
-        });
-
-        // timeout to ensure the first function starts its execution before we
-        // trigger d's callbacks.
-        return new Promise(f => setTimeout(f, 0)).then(function() {
-          assert.deepEqual(['a'], order);
-          d.fulfill();
-          return waitForIdle().then(function() {
-            assert.deepEqual(['a', 'b', 'c'], order);
-          });
-        });
-      });
-    });
-
-    it('returnsADeferredAction', function() {
-      let executor = new FakeExecutor().
-          expect(CName.GET_TITLE).andReturnSuccess('Google').
-          end();
-
-      var driver = executor.createDriver();
-      driver.call(function() {
-        return driver.getTitle();
-      }).then(function(title) {
-        assert.equal('Google', title);
-      });
-      return waitForIdle();
-    });
-  });
-
-  describe('nestedCommands', function() {
-    enablePromiseManager(() => {
-      it('commandExecutionOrder', function() {
-        var msg = [];
-        var driver = new FakeExecutor().createDriver();
-        driver.call(msg.push, msg, 'a');
-        driver.call(function() {
-          driver.call(msg.push, msg, 'c');
-          driver.call(function() {
-            driver.call(msg.push, msg, 'e');
-            driver.call(msg.push, msg, 'f');
-          });
-          driver.call(msg.push, msg, 'd');
-        });
-        driver.call(msg.push, msg, 'b');
-        return waitForIdle().then(function() {
-          assert.equal('acefdb', msg.join(''));
-        });
-      });
-
-      it('basicUsage', function() {
-        var msg = [];
-        var driver = new FakeExecutor().createDriver();
-        var pushMsg = msg.push.bind(msg);
-        driver.call(() => 'cheese ').then(pushMsg);
-        driver.call(function() {
-          driver.call(() => 'is ').then(pushMsg);
-          driver.call(() => 'tasty').then(pushMsg);
-        });
-        driver.call(() => '!').then(pushMsg);
-        return waitForIdle().then(function() {
-          assert.equal('cheese is tasty!', msg.join(''));
-        });
-      });
-
-      it('normalCommandAfterNestedCommandThatReturnsAnAction', function() {
-        var msg = [];
-        let executor = new FakeExecutor().
-            expect(CName.CLOSE).
-            end();
-        var driver = executor.createDriver();
-        driver.call(function() {
-          return driver.call(function() {
-            msg.push('a');
-            return driver.call(() => 'foobar');
-          });
-        });
-        driver.close().then(function() {
-          msg.push('b');
-        });
-        return waitForIdle().then(function() {
-          assert.equal('ab', msg.join(''));
-        });
-      });
-    });
-
-    it('canReturnValueFromNestedFunction', function() {
-      var driver = new FakeExecutor().createDriver();
-      return driver.call(function() {
-        return driver.call(function() {
-          return driver.call(() => 'foobar');
-        });
-      }).then(function(value) {
-        assert.equal('foobar', value);
-      });
-    });
-
-    it('errorsBubbleUp_caught', function() {
-      var driver = new FakeExecutor().createDriver();
-      var result = driver.call(function() {
-        return driver.call(function() {
-          return driver.call(throwStubError);
-        });
-      }).then(fail, assertIsStubError);
-      return Promise.all([waitForIdle(), result]);
-    });
-
-    it('errorsBubbleUp_uncaught', function() {
-      var driver = new FakeExecutor().createDriver();
-      return driver.call(function() {
-        return driver.call(function() {
-          return driver.call(throwStubError);
-        });
-      })
-      .then(_ => assert.fail('should have failed'), assertIsStubError);
-    });
-
-    it('canScheduleCommands', function() {
-      let executor = new FakeExecutor().
-          expect(CName.GET_TITLE).
-          expect(CName.CLOSE).
-          end();
-
-      var driver = executor.createDriver();
-      driver.call(function() {
-        driver.call(function() {
-          driver.getTitle();
-        });
-        driver.close();
-      });
-      return waitForIdle();
-    });
-  });
-
   describe('WebElementPromise', function() {
     let driver = new FakeExecutor().createDriver();
 
@@ -1227,8 +699,7 @@ describe('WebDriver', function() {
 
       var driver = executor.createDriver();
       var element = driver.findElement(By.id('foo'));
-      element.click();
-      return waitForIdle();
+      return element.click();
     });
 
     it('canUseElementInCallback', function() {
@@ -1241,10 +712,7 @@ describe('WebDriver', function() {
           end();
 
       var driver = executor.createDriver();
-      driver.findElement(By.id('foo')).then(function(element) {
-        element.click();
-      });
-      return waitForIdle();
+      return driver.findElement(By.id('foo')).then(e => e.click());
     });
 
     it('byJs', function() {
@@ -1258,9 +726,8 @@ describe('WebDriver', function() {
           end();
 
       var driver = executor.createDriver();
-      var element = driver.findElement(By.js('return document.body'));
-      element.click();  // just to make sure
-      return waitForIdle();
+      return driver.findElement(By.js('return document.body'))
+          .then(e => e.click());
     });
 
     it('byJs_returnsNonWebElementValue', function() {
@@ -1288,8 +755,7 @@ describe('WebDriver', function() {
           andReturnSuccess(WebElement.buildId('one')).
           end();
       var driver = executor.createDriver();
-      driver.findElement(By.js(script, 'div'));
-      return waitForIdle();
+      return driver.findElement(By.js(script, 'div'));
     });
 
     it('customLocator', function() {
@@ -1332,7 +798,7 @@ describe('WebDriver', function() {
       var driver = executor.createDriver();
       return driver.findElements(By.tagName('a'))
           .then(function(elements) {
-            return promise.all(elements.map(function(e) {
+            return Promise.all(elements.map(function(e) {
               assert.ok(e instanceof WebElement);
               return e.getId();
             }));
@@ -1355,7 +821,7 @@ describe('WebDriver', function() {
       return driver.
           findElements(By.js('return document.getElementsByTagName("div");')).
           then(function(elements) {
-            return promise.all(elements.map(function(e) {
+            return Promise.all(elements.map(function(e) {
               assert.ok(e instanceof WebElement);
               return e.getId();
             }));
@@ -1383,15 +849,14 @@ describe('WebDriver', function() {
           end();
 
       var driver = executor.createDriver();
-      driver.findElements(By.js('return document.getElementsByTagName("div");')).
+      return driver.findElements(By.js('return document.getElementsByTagName("div");')).
           then(function(elements) {
-            return promise.all(elements.map(function(e) {
+            return Promise.all(elements.map(function(e) {
               assert.ok(e instanceof WebElement);
               return e.getId();
             }));
           }).
           then((actual) => assert.deepEqual(ids, actual));
-      return waitForIdle();
     });
 
     it('byJs_convertsSingleWebElementResponseToArray', function() {
@@ -1407,7 +872,7 @@ describe('WebDriver', function() {
       return driver.
           findElements(By.js('return document.getElementsByTagName("div");')).
           then(function(elements) {
-            return promise.all(elements.map(function(e) {
+            return Promise.all(elements.map(function(e) {
               assert.ok(e instanceof WebElement);
               return e.getId();
             }));
@@ -1431,7 +896,7 @@ describe('WebDriver', function() {
       var driver = executor.createDriver();
       return driver.findElements(By.js(script, 'div'))
           then(function(elements) {
-            return promise.all(elements.map(function(e) {
+            return Promise.all(elements.map(function(e) {
               assert.ok(e instanceof WebElement);
               return e.getId();
             }));
@@ -1452,8 +917,7 @@ describe('WebDriver', function() {
 
       var driver = executor.createDriver();
       var element = new WebElement(driver, 'one');
-      element.sendKeys(1, 2, 'abc', 3);
-      return waitForIdle();
+      return element.sendKeys(1, 2, 'abc', 3);
     });
 
     it('convertsVarArgsIntoStrings_promisedArgs', function() {
@@ -1512,8 +976,7 @@ describe('WebDriver', function() {
                 andReturnSuccess().
             end();
 
-        executor.createDriver().switchTo().window('foo');
-        return waitForIdle();
+        return executor.createDriver().switchTo().window('foo');
       });
 
       it('should propagate exceptions', function() {
@@ -1552,6 +1015,174 @@ describe('WebDriver', function() {
   });
 
   describe('waiting', function() {
+    it('on a condition that always returns true', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      let count = 0;
+      function condition() {
+        count++;
+        return true;
+      }
+      return driver.wait(condition, 1)
+          .then(() => assert.equal(1, count));
+    });
+
+    it('on a simple counting condition', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      let count = 0;
+      function condition() {
+        return ++count === 3;
+      }
+      return driver.wait(condition, 250)
+          .then(() => assert.equal(3, count));
+    });
+
+    it('on a condition that returns a promise', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+
+      let count = 0;
+      function condition() {
+        count += 1;
+        return new Promise(resolve => {
+          setTimeout(() => resolve(true), 50);
+        });
+      }
+
+      return driver.wait(condition, 75)
+          .then(() => assert.equal(1, count));
+    });
+
+    it('on a condition that returns a promise', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+
+      let count = 0;
+      function condition() {
+        count += 1;
+        return new Promise(resolve => {
+          setTimeout(() => resolve(count === 3), 25);
+        });
+      }
+
+      return driver.wait(condition, 100)
+          .then(() => assert.equal(3, count));
+    });
+
+    it('fails if condition throws', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      return driver.wait(throwStubError, 0, 'goes boom')
+          .then(fail, assertIsStubError);
+    });
+
+    it('fails if condition returns a rejected promise', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      function condition() {
+        return new Promise((_, reject) => reject(new StubError));
+      }
+      return driver.wait(condition, 0, 'goes boom')
+          .then(fail, assertIsStubError);
+    });
+
+    it('waits forever on a zero timeout', function() {
+      let done = false;
+      setTimeout(() => done = true, 150);
+
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      let waitResult = driver.wait(() => done, 0);
+
+      return driver.sleep(75).then(function() {
+        assert.ok(!done);
+        return driver.sleep(100);
+      }).then(function() {
+        assert.ok(done);
+        return waitResult;
+      });
+    });
+
+    it('waits forever if timeout omitted', function() {
+      let done = false;
+      setTimeout(() => done = true, 150);
+
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      let waitResult = driver.wait(() => done);
+
+      return driver.sleep(75).then(function() {
+        assert.ok(!done);
+        return driver.sleep(100);
+      }).then(function() {
+        assert.ok(done);
+        return waitResult;
+      });
+    });
+
+    it('times out when timer expires', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+
+      let count  = 0;
+      let wait = driver.wait(function() {
+        count += 1;
+        let ms = count === 2 ? 65 : 5;
+        return promise.delayed(ms).then(function() {
+          return false;
+        });
+      }, 60, 'counting to 3')
+
+      return wait.then(fail, function(e) {
+        assert.equal(2, count);
+        assert.ok(e instanceof error.TimeoutError, 'Unexpected error: ' + e);
+        assert.ok(
+            /^counting to 3\nWait timed out after \d+ms$/.test(e.message));
+      });
+    });
+
+    it('requires condition to be a promise or function', function() {
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      assert.throws(() => driver.wait(1234, 0));
+    });
+
+    it('promise that does not resolve before timeout', function() {
+      let d = defer();
+
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      return driver.wait(d.promise, 5).then(fail, e => {
+        assert.ok(e instanceof error.TimeoutError, 'Unexpected error: ' + e);
+        assert.ok(
+            /Timed out waiting for promise to resolve after \d+ms/
+                .test(e.message),
+            'unexpected error message: ' + e.message);
+      });
+    });
+
+    it('unbounded wait on promise resolution', function() {
+      let messages = [];
+      let d = defer();
+
+      let executor = new FakeExecutor();
+      let driver = executor.createDriver();
+      let waitResult = driver.wait(d.promise).then(function(value) {
+        messages.push('b');
+        assert.equal(1234, value);
+      });
+
+      setTimeout(() => messages.push('a'), 5);
+      return driver.sleep(10).then(function() {
+        assert.deepEqual(['a'], messages);
+        d.resolve(1234);
+        return waitResult;
+      }).then(function() {
+        assert.deepEqual(['a', 'b'], messages);
+      });
+    });
+
     describe('supports custom wait functions', function() {
       it('waitSucceeds', function() {
         let executor = new FakeExecutor().
@@ -1565,10 +1196,9 @@ describe('WebDriver', function() {
             end();
 
         var driver = executor.createDriver();
-        driver.wait(function() {
+        return driver.wait(function() {
           return driver.findElements(By.id('foo')).then(els => els.length > 0);
         }, 200);
-        return waitForIdle();
       });
 
       it('waitTimesout_timeoutCaught', function() {
@@ -1587,26 +1217,6 @@ describe('WebDriver', function() {
               e.message.substring(0, 'Wait timed out after '.length));
         });
       });
-
-      enablePromiseManager(() => {
-        it('waitTimesout_timeoutNotCaught', function() {
-          let executor = new FakeExecutor().
-              expect(CName.FIND_ELEMENTS,
-                     {using: 'css selector', value: '*[id="foo"]'}).
-                  andReturnSuccess([]).
-                  anyTimes().
-              end();
-
-          var driver = executor.createDriver();
-          driver.wait(function() {
-            return driver.findElements(By.id('foo')).then(els => els.length > 0);
-          }, 25);
-          return waitForAbort().then(function(e) {
-            assert.equal('Wait timed out after ',
-                e.message.substring(0, 'Wait timed out after '.length));
-          });
-        });
-      });
     });
 
     describe('supports condition objects', function() {
@@ -1694,30 +1304,6 @@ describe('WebDriver', function() {
           .then(assert.fail, v => assert.strictEqual(v, e));
     });
 
-    enablePromiseManager(() => {
-      it('alertsBelongToSameFlowAsParentDriver', function() {
-        let executor = new FakeExecutor()
-            .expect(CName.GET_ALERT_TEXT).andReturnSuccess('hello')
-            .end();
-
-        var driver = executor.createDriver();
-        var otherFlow = new promise.ControlFlow();
-        otherFlow.execute(function() {
-          driver.switchTo().alert().then(function() {
-            assert.strictEqual(
-                driver.controlFlow(), promise.controlFlow(),
-                'Alert should belong to the same flow as its parent driver');
-          });
-        });
-
-        assert.notEqual(otherFlow, driver.controlFlow);
-        return Promise.all([
-          waitForIdle(otherFlow),
-          waitForIdle(driver.controlFlow())
-        ]);
-      });
-    });
-
     it('commandsFailIfAlertNotPresent', function() {
       let e = new error.NoSuchAlertError;
       let executor = new FakeExecutor()
@@ -1741,30 +1327,6 @@ describe('WebDriver', function() {
     });
   });
 
-  enablePromiseManager(() => {
-    it('testWebElementsBelongToSameFlowAsParentDriver', function() {
-      let executor = new FakeExecutor()
-          .expect(CName.FIND_ELEMENT,
-                  {using: 'css selector', value: '*[id="foo"]'})
-          .andReturnSuccess(WebElement.buildId('abc123'))
-          .end();
-
-      var driver = executor.createDriver();
-      var otherFlow = new promise.ControlFlow();
-      otherFlow.execute(function() {
-        driver.findElement({id: 'foo'}).then(function() {
-          assert.equal(driver.controlFlow(), promise.controlFlow());
-        });
-      });
-
-      assert.notEqual(otherFlow, driver.controlFlow);
-      return Promise.all([
-        waitForIdle(otherFlow),
-        waitForIdle(driver.controlFlow())
-      ]);
-    });
-  });
-
   it('testFetchingLogs', function() {
     let executor = new FakeExecutor().
         expect(CName.GET_LOG, {'type': 'browser'}).
@@ -1796,10 +1358,7 @@ describe('WebDriver', function() {
     var driver = new FakeExecutor().createDriver(session);
     var navigateResult = driver.get('some-url').then(fail, assertIsStubError);
     var quitResult = driver.quit().then(fail, assertIsStubError);
-
-    return waitForIdle().then(function() {
-      return promise.all(navigateResult, quitResult);
-    });
+    return Promise.all([navigateResult, quitResult]);
   });
 
   it('testWebElementCommandsFailIfInitialDriverCreationFailed', function() {
@@ -1838,120 +1397,60 @@ describe('WebDriver', function() {
   });
 
   describe('actions()', function() {
-    it('failsIfInitialDriverCreationFailed', function() {
-      let session = Promise.reject(new StubError('no session for you'));
-      let driver = new FakeExecutor().createDriver(session);
-      driver.getSession().catch(function() {});
-      return driver.
-          actions().
-          mouseDown().
-          mouseUp().
-          perform().
-          catch(assertIsStubError);
-    });
-
-    describe('mouseMove', function() {
-      it('noElement', function() {
+    describe('move()', function() {
+      it('no origin', function() {
         let executor = new FakeExecutor()
-            .expect(CName.MOVE_TO, {'xoffset': 0, 'yoffset': 125})
+            .expect(CName.ACTIONS, {
+              actions:  [{
+                type: 'pointer',
+                id: 'default mouse',
+                parameters: {
+                  pointerType: 'mouse'
+                },
+                actions: [{
+                  duration: 100,
+                  origin: 'viewport',
+                  type: 'pointerMove',
+                  x: 0,
+                  y: 125
+                }]
+              }]
+            })
             .andReturnSuccess()
             .end();
 
-        return executor.createDriver().
-            actions().
-            mouseMove({x: 0, y: 125}).
-            perform();
+        let driver = executor.createDriver();
+        return driver.actions().move({x: 0, y: 125}).perform();
       });
 
-      it('element', function() {
+      it('origin = element', function() {
         let executor = new FakeExecutor()
             .expect(CName.FIND_ELEMENT,
                     {using: 'css selector', value: '*[id="foo"]'})
                 .andReturnSuccess(WebElement.buildId('abc123'))
-            .expect(CName.MOVE_TO,
-                    {'element': 'abc123', 'xoffset': 0, 'yoffset': 125})
-                .andReturnSuccess()
+            .expect(CName.ACTIONS, {
+              actions:  [{
+                type: 'pointer',
+                id: 'default mouse',
+                parameters: {
+                  pointerType: 'mouse'
+                },
+                actions: [{
+                  duration: 100,
+                  origin: WebElement.buildId('abc123'),
+                  type: 'pointerMove',
+                  x: 0,
+                  y: 125
+                }]
+              }]
+            })
             .end();
 
-        var driver = executor.createDriver();
-        var element = driver.findElement(By.id('foo'));
-        return driver.actions()
-            .mouseMove(element, {x: 0, y: 125})
-            .perform();
+        let driver = executor.createDriver();
+        let element = driver.findElement(By.id('foo'));
+        return driver.actions().move({x: 0, y: 125, origin: element}).perform();
       });
     });
-
-    it('supportsMouseDown', function() {
-      let executor = new FakeExecutor()
-          .expect(CName.MOUSE_DOWN, {'button': Button.LEFT})
-              .andReturnSuccess()
-          .end();
-
-      return executor.createDriver().
-          actions().
-          mouseDown().
-          perform();
-    });
-
-    it('testActionSequence', function() {
-      let executor = new FakeExecutor()
-          .expect(CName.FIND_ELEMENT,
-                  {using: 'css selector', value: '*[id="a"]'})
-              .andReturnSuccess(WebElement.buildId('id1'))
-          .expect(CName.FIND_ELEMENT,
-                  {using: 'css selector', value: '*[id="b"]'})
-              .andReturnSuccess(WebElement.buildId('id2'))
-          .expect(CName.SEND_KEYS_TO_ACTIVE_ELEMENT,
-              {'value': [Key.SHIFT]})
-              .andReturnSuccess()
-          .expect(CName.MOVE_TO, {'element': 'id1'})
-              .andReturnSuccess()
-          .expect(CName.CLICK, {'button': Button.LEFT})
-              .andReturnSuccess()
-          .expect(CName.MOVE_TO, {'element': 'id2'})
-              .andReturnSuccess()
-          .expect(CName.CLICK, {'button': Button.LEFT})
-              .andReturnSuccess()
-          .end();
-
-      var driver = executor.createDriver();
-      var element1 = driver.findElement(By.id('a'));
-      var element2 = driver.findElement(By.id('b'));
-
-      return driver.actions()
-          .keyDown(Key.SHIFT)
-          .click(element1)
-          .click(element2)
-          .perform();
-    });
-  });
-
-  describe('touchActions()', function() {
-    it('failsIfInitialDriverCreationFailed', function() {
-      let session = Promise.reject(new StubError);
-      let driver = new FakeExecutor().createDriver(session);
-      driver.getSession().catch(function() {});
-      return driver.
-          touchActions().
-          scroll({x: 3, y: 4}).
-          perform().
-          catch(assertIsStubError);
-    });
-
-    it('testTouchActionSequence', function() {
-      let executor = new FakeExecutor()
-          .expect(CName.TOUCH_DOWN, {x: 1, y: 2}).andReturnSuccess()
-          .expect(CName.TOUCH_MOVE, {x: 3, y: 4}).andReturnSuccess()
-          .expect(CName.TOUCH_UP, {x: 5, y: 6}).andReturnSuccess()
-          .end();
-
-      var driver = executor.createDriver();
-      return driver.touchActions()
-          .tapAndHold({x: 1, y: 2})
-          .move({x: 3, y: 4})
-          .release({x: 5, y: 6})
-          .perform();
-    });
   });
 
   describe('manage()', function() {
@@ -2024,101 +1523,7 @@ describe('WebDriver', function() {
         let driver = executor.createDriver();
         return driver.manage().setTimeouts({implicit: 3});
       });
-
-      describe('deprecated API calls setTimeouts()', function() {
-        it('implicitlyWait()', function() {
-          let executor = new FakeExecutor()
-              .expect(CName.SET_TIMEOUT, {implicit: 3})
-              .andReturnSuccess()
-              .end();
-          let driver = executor.createDriver();
-          return driver.manage().timeouts().implicitlyWait(3);
-        });
-
-        it('setScriptTimeout()', function() {
-          let executor = new FakeExecutor()
-              .expect(CName.SET_TIMEOUT, {script: 3})
-              .andReturnSuccess()
-              .end();
-          let driver = executor.createDriver();
-          return driver.manage().timeouts().setScriptTimeout(3);
-        });
-
-        it('pageLoadTimeout()', function() {
-          let executor = new FakeExecutor()
-              .expect(CName.SET_TIMEOUT, {pageLoad: 3})
-              .andReturnSuccess()
-              .end();
-          let driver = executor.createDriver();
-          return driver.manage().timeouts().pageLoadTimeout(3);
-        });
-      });
-    });
-  });
-
-  describe('generator support', function() {
-    var driver;
-
-    beforeEach(function() {
-      driver = new WebDriver(
-          new Session('test-session', {}),
-          new ExplodingExecutor());
-    });
-
-    it('canUseGeneratorsWithWebDriverCall', function() {
-      return driver.call(function* () {
-        var x = yield Promise.resolve(1);
-        var y = yield Promise.resolve(2);
-        return x + y;
-      }).then(function(value) {
-        assert.deepEqual(3, value);
-      });
     });
-
-    it('canDefineScopeOnGeneratorCall', function() {
-      return driver.call(function* () {
-        var x = yield Promise.resolve(1);
-        return this.name + x;
-      }, {name: 'Bob'}).then(function(value) {
-        assert.deepEqual('Bob1', value);
-      });
-    });
-
-    it('canSpecifyArgsOnGeneratorCall', function() {
-      return driver.call(function* (a, b) {
-        var x = yield Promise.resolve(1);
-        var y = yield Promise.resolve(2);
-        return [x + y, a, b];
-      }, null, 'abc', 123).then(function(value) {
-        assert.deepEqual([3, 'abc', 123], value);
-      });
-    });
-
-    it('canUseGeneratorWithWebDriverWait', function() {
-      var values = [];
-      return driver.wait(function* () {
-        yield values.push(1);
-        values.push(yield promise.delayed(10).then(function() {
-          return 2;
-        }));
-        yield values.push(3);
-        return values.length === 6;
-      }, 250).then(function() {
-        assert.deepEqual([1, 2, 3, 1, 2, 3], values);
-      });
-    });
-
-    /**
-     * @constructor
-     * @implements {CommandExecutor}
-     */
-    function ExplodingExecutor() {}
-
-
-    /** @override */
-    ExplodingExecutor.prototype.execute = function(command, cb) {
-      cb(Error('Unsupported operation'));
-    };
   });
 
   describe('wire format', function() {
@@ -2128,10 +1533,16 @@ describe('WebDriver', function() {
       function runSerializeTest(input, want) {
         let executor = new FakeExecutor().
             expect(CName.NEW_SESSION).
-            withParameters({'desiredCapabilities': want}).
+            withParameters({
+              'desiredCapabilities': {'serialize-test': want},
+              'capabilities': {'alwaysMatch': {}},
+            }).
             andReturnSuccess({'browserName': 'firefox'}).
             end();
-        return WebDriver.createSession(executor, input)
+        // We stuff the value to be serialized inside of a capabilities object,
+        // using a non-W3C key so that the value gets dropped from the W3C
+        // capabilities object.
+        return WebDriver.createSession(executor, {'serialize-test': input})
             .getSession();
       }
 
@@ -2224,8 +1635,7 @@ describe('WebDriver', function() {
 
         it('with sub-objects', function() {
           var expected = {sessionId: {value: 'foo'}};
-          return runSerializeTest(
-              {sessionId: {value: 'foo'}}, expected);
+          return runSerializeTest({sessionId: {value: 'foo'}}, expected);
         });
 
         it('with values that have toJSON', function() {
@@ -2257,6 +1667,24 @@ describe('WebDriver', function() {
 
           return runSerializeTest(parameters, expected);
         });
+
+        it('nested promises', function() {
+          const input = {
+            'struct': Promise.resolve({
+              'element': new WebElementPromise(
+                  FAKE_DRIVER,
+                  Promise.resolve(new WebElement(FAKE_DRIVER, 'fefifofum')))
+            })
+          };
+
+          const want = {
+            'struct': {
+              'element': WebElement.buildId('fefifofum')
+            }
+          };
+
+          return runSerializeTest(input, want);
+        });
       });
     });