selenium-webdriver 3.0.0-beta-1 → 3.0.1

package/test/http/util_test.js

@@ -17,11 +17,12 @@
 
 'use strict';
 
-var assert = require('assert'),
-    http = require('http');
+const assert = require('assert');
+const http = require('http');
 
-var error = require('../../lib/error');
-var util = require('../../http/util');
+const error = require('../../lib/error');
+const util = require('../../http/util');
+const promise = require('../../lib/promise');
 
 describe('selenium-webdriver/http/util', function() {
 
@@ -123,19 +124,15 @@ describe('selenium-webdriver/http/util', function() {
                function() {});
     });
 
-    it('can cancel wait', function(done) {
+    it('can cancel wait', function() {
       status = 1;
-      var err = Error('cancelled!');
-      var isReady =  util.waitForServer(baseUrl, 200).
-          then(function() { done('Did not expect to succeed'); }).
-          then(null, function(e) {
-            assert.equal('cancelled!', e.message);
-          }).
-          then(function() { done(); }, done);
-
-      setTimeout(function() {
-        isReady.cancel('cancelled!');
-      }, 50);
+      let cancel = new Promise(resolve => {
+        setTimeout(_ => resolve(), 50)
+      });
+      return util.waitForServer(baseUrl, 200, cancel)
+          .then(
+              () => { throw Error('Did not expect to succeed!'); },
+              (e) => assert.ok(e instanceof promise.CancellationError));
     });
   });
 
@@ -167,18 +164,15 @@ describe('selenium-webdriver/http/util', function() {
       });
     });
 
-    it('can cancel wait', function(done) {
+    it('can cancel wait', function() {
       responseCode = 404;
-      var isReady =  util.waitForUrl(baseUrl, 200).
-          then(function() { done('Did not expect to succeed'); }).
-          then(null, function(e) {
-            assert.equal('cancelled!', e.message);
-          }).
-          then(function() { done(); }, done);
-
-      setTimeout(function() {
-        isReady.cancel('cancelled!');
-      }, 50);
+      let cancel = new Promise(resolve => {
+        setTimeout(_ => resolve(), 50);
+      });
+      return util.waitForUrl(baseUrl, 200, cancel)
+          .then(
+              () => { throw Error('Did not expect to succeed!'); },
+              (e) => assert.ok(e instanceof promise.CancellationError));
     });
   });
 });

package/test/io_test.js

@@ -22,10 +22,7 @@ var assert = require('assert'),
     path = require('path'),
     tmp = require('tmp');
 
-var io = require('../io'),
-    before = require('../testing').before,
-    beforeEach = require('../testing').beforeEach,
-    it = require('../testing').it;
+var io = require('../io');
 
 
 describe('io', function() {
@@ -310,7 +307,7 @@ describe('io', function() {
     });
 
     it('catches errors from invalid input', function() {
-      return io.read(1234)
+      return io.read({})
           .then(() => assert.fail('should have failed'),
                 (e) => assert.ok(e instanceof TypeError));
     });

package/test/lib/http_test.js

@@ -84,12 +84,14 @@ describe('http', function() {
 
     describe('command routing', function() {
       it('rejects unrecognized commands', function() {
-        assert.throws(
-            () => executor.execute(new Command('fake-name')),
-            function (err) {
-              return err instanceof error.UnknownCommandError
-                  && 'Unrecognized command: fake-name' === err.message;
-            });
+        return executor.execute(new Command('fake-name'))
+            .then(assert.fail, err => {
+              if (err instanceof error.UnknownCommandError
+                  && 'Unrecognized command: fake-name' === err.message) {
+                return;
+              }
+              throw err;
+            })
       });
 
       it('rejects promise if client fails to send request', function() {

package/test/lib/promise_aplus_test.js

@@ -18,57 +18,61 @@
 'use strict';
 
 const promise = require('../../lib/promise');
+const {enablePromiseManager} = require('../../lib/test/promise');
 
 describe('Promises/A+ Compliance Tests', function() {
-  // The promise spec does not define behavior for unhandled rejections and
-  // assumes they are effectively swallowed. This is not the case with our
-  // implementation, so we have to disable error propagation to test that the
-  // rest of our behavior is compliant.
-  // We run the tests with a separate instance of the control flow to ensure
-  // disablign error propagation does not impact other tests.
-  var flow = new promise.ControlFlow();
-  flow.setPropagateUnhandledRejections(false);
+  enablePromiseManager(() => {
+    // The promise spec does not define behavior for unhandled rejections and
+    // assumes they are effectively swallowed. This is not the case with our
+    // implementation, so we have to disable error propagation to test that the
+    // rest of our behavior is compliant.
+    // We run the tests with a separate instance of the control flow to ensure
+    // disablign error propagation does not impact other tests.
+    var flow = new promise.ControlFlow();
+    flow.setPropagateUnhandledRejections(false);
 
-  // Skip the tests in 2.2.6.1/2. We are not compliant in these scenarios.
-  var realDescribe = global.describe;
-  global.describe = function(name, fn) {
-    realDescribe(name, function() {
-      var prefix = 'Promises/A+ Compliance Tests 2.2.6: '
-          + '`then` may be called multiple times on the same promise.';
-      var suffix = 'even when one handler is added inside another handler';
-      if (this.fullTitle().startsWith(prefix)
-          && this.fullTitle().endsWith(suffix)) {
-        var realSpecify = global.specify;
-        try {
-          global.specify = function(name) {
-            realSpecify(name);
-          };
+    // Skip the tests in 2.2.6.1/2. We are not compliant in these scenarios.
+    var realDescribe = global.describe;
+    global.describe = function(name, fn) {
+      realDescribe(name, function() {
+        var prefix = 'Promises/A+ Compliance Tests '
+            + 'SELENIUM_PROMISE_MANAGER=true 2.2.6: '
+            + '`then` may be called multiple times on the same promise.';
+        var suffix = 'even when one handler is added inside another handler';
+        if (this.fullTitle().startsWith(prefix)
+            && this.fullTitle().endsWith(suffix)) {
+          var realSpecify = global.specify;
+          try {
+            global.specify = function(name) {
+              realSpecify(name);
+            };
+            fn();
+          } finally {
+            global.specify = realSpecify;
+          }
+        } else {
           fn();
-        } finally {
-          global.specify = realSpecify;
         }
-      } else {
-        fn();
+      });
+    };
+
+    require('promises-aplus-tests').mocha({
+      resolved: function(value) {
+        return new promise.Promise((fulfill) => fulfill(value), flow);
+      },
+      rejected: function(error) {
+        return new promise.Promise((_, reject) => reject(error), flow);
+      },
+      deferred: function() {
+        var d = new promise.Deferred(flow);
+        return {
+          resolve: d.fulfill,
+          reject: d.reject,
+          promise: d.promise
+        };
       }
     });
-  };
 
-  require('promises-aplus-tests').mocha({
-    resolved: function(value) {
-      return new promise.Promise((fulfill) => fulfill(value), flow);
-    },
-    rejected: function(error) {
-      return new promise.Promise((_, reject) => reject(error), flow);
-    },
-    deferred: function() {
-      var d = new promise.Deferred(flow);
-      return {
-        resolve: d.fulfill,
-        reject: d.reject,
-        promise: d.promise
-      };
-    }
+    global.describe = realDescribe;
   });
-
-  global.describe = realDescribe;
 });