selenium-webdriver 3.3.0 → 4.0.0-alpha.1

package/test/chrome/service_test.js

@@ -17,28 +17,28 @@
 
 'use strict';
 
-var webdriver = require('../..'),
-    chrome = require('../../chrome'),
-    assert = require('../../testing/assert');
+const assert = require('assert');
 
-var test = require('../../lib/test');
+const chrome = require('../../chrome');
+const test = require('../../lib/test');
+const webdriver = require('../..');
 
 
 test.suite(function(env) {
   describe('chromedriver', function() {
     var service;
-    test.afterEach(function() {
+    afterEach(function() {
       if (service) {
         return service.kill();
       }
     });
 
-    test.it('can be started on a custom path', function() {
+    it('can be started on a custom path', function() {
       service = new chrome.ServiceBuilder()
           .setPath('/foo/bar/baz')
           .build();
       return service.start().then(function(url) {
-        assert(url).endsWith('/foo/bar/baz');
+        assert.ok(url.endsWith('/foo/bar/baz'), 'unexpected url: ' + url);
       });
     });
   });

package/test/cookie_test.js

@@ -20,157 +20,171 @@
 var assert = require('assert'),
     url = require('url');
 
-var test = require('../lib/test'),
+var {Pages, ignore, suite} = require('../lib/test'),
     fileserver = require('../lib/test/fileserver'),
-    Browser = require('..').Browser,
-    Pages = test.Pages;
+    {Browser} = require('..');
 
 
-test.suite(function(env) {
+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() {
     return driver.quit();
   });
 
-  // Cookie handling is broken.
-  test.ignore(env.browsers(Browser.PHANTOM_JS, Browser.SAFARI)).
   describe('Cookie Management;', function() {
 
-    test.beforeEach(function*() {
-      yield driver.get(fileserver.Pages.ajaxyPage);
-      yield driver.manage().deleteAllCookies();
+    beforeEach(async function() {
+      await driver.get(fileserver.Pages.ajaxyPage);
+      await driver.manage().deleteAllCookies();
       return assertHasCookies();
     });
 
-    test.it('can add new cookies', function*() {
+    it('can add new cookies', async function() {
       var cookie = createCookieSpec();
 
-      yield driver.manage().addCookie(cookie);
-      yield driver.manage().getCookie(cookie.name).then(function(actual) {
+      await driver.manage().addCookie(cookie);
+      await driver.manage().getCookie(cookie.name).then(function(actual) {
         assert.equal(actual.value, cookie.value);
       });
     });
 
-    test.it('can get all cookies', function*() {
+    it('can get all cookies', async function() {
       var cookie1 = createCookieSpec();
       var cookie2 = createCookieSpec();
 
-      yield driver.manage().addCookie(cookie1);
-      yield driver.manage().addCookie(cookie2);
+      await driver.manage().addCookie(cookie1);
+      await driver.manage().addCookie(cookie2);
 
       return assertHasCookies(cookie1, cookie2);
     });
 
-    test.ignore(env.browsers(Browser.IE)).
-    it('only returns cookies visible to the current page', function*() {
+    ignore(env.browsers(Browser.IE)).
+    it('only returns cookies visible to the current page', async function() {
       var cookie1 = createCookieSpec();
 
-      yield driver.manage().addCookie(cookie1);
+      await driver.manage().addCookie(cookie1);
 
       var pageUrl = fileserver.whereIs('page/1');
       var cookie2 = createCookieSpec({
         path: url.parse(pageUrl).pathname
       });
-      yield driver.get(pageUrl);
-      yield driver.manage().addCookie(cookie2);
-      yield assertHasCookies(cookie1, cookie2);
+      await driver.get(pageUrl);
+      await driver.manage().addCookie(cookie2);
+      await assertHasCookies(cookie1, cookie2);
 
-      yield driver.get(fileserver.Pages.ajaxyPage);
-      yield assertHasCookies(cookie1);
+      await driver.get(fileserver.Pages.ajaxyPage);
+      await assertHasCookies(cookie1);
 
-      yield driver.get(pageUrl);
-      yield assertHasCookies(cookie1, cookie2);
+      await driver.get(pageUrl);
+      await assertHasCookies(cookie1, cookie2);
     });
 
-    test.it('can delete all cookies', function*() {
+    it('can delete all cookies', async function() {
       var cookie1 = createCookieSpec();
       var cookie2 = createCookieSpec();
 
-      yield driver.executeScript(
+      await driver.executeScript(
           'document.cookie = arguments[0] + "=" + arguments[1];' +
           'document.cookie = arguments[2] + "=" + arguments[3];',
           cookie1.name, cookie1.value, cookie2.name, cookie2.value);
-      yield assertHasCookies(cookie1, cookie2);
+      await assertHasCookies(cookie1, cookie2);
 
-      yield driver.manage().deleteAllCookies();
-      yield assertHasCookies();
+      await driver.manage().deleteAllCookies();
+      await assertHasCookies();
     });
 
-    test.it('can delete cookies by name', function*() {
+    it('can delete cookies by name', async function() {
       var cookie1 = createCookieSpec();
       var cookie2 = createCookieSpec();
 
-      yield driver.executeScript(
+      await driver.executeScript(
           'document.cookie = arguments[0] + "=" + arguments[1];' +
           'document.cookie = arguments[2] + "=" + arguments[3];',
           cookie1.name, cookie1.value, cookie2.name, cookie2.value);
-      yield assertHasCookies(cookie1, cookie2);
+      await assertHasCookies(cookie1, cookie2);
 
-      yield driver.manage().deleteCookie(cookie1.name);
-      yield assertHasCookies(cookie2);
+      await driver.manage().deleteCookie(cookie1.name);
+      await assertHasCookies(cookie2);
     });
 
-    test.it('should only delete cookie with exact name', function*() {
+    it('should only delete cookie with exact name', async function() {
       var cookie1 = createCookieSpec();
       var cookie2 = createCookieSpec();
       var cookie3 = {name: cookie1.name + 'xx', value: cookie1.value};
 
-      yield driver.executeScript(
+      await driver.executeScript(
           'document.cookie = arguments[0] + "=" + arguments[1];' +
           'document.cookie = arguments[2] + "=" + arguments[3];' +
           'document.cookie = arguments[4] + "=" + arguments[5];',
           cookie1.name, cookie1.value, cookie2.name, cookie2.value,
           cookie3.name, cookie3.value);
-      yield assertHasCookies(cookie1, cookie2, cookie3);
+      await assertHasCookies(cookie1, cookie2, cookie3);
 
-      yield driver.manage().deleteCookie(cookie1.name);
-      yield assertHasCookies(cookie2, cookie3);
+      await driver.manage().deleteCookie(cookie1.name);
+      await assertHasCookies(cookie2, cookie3);
     });
 
-    test.it('can delete cookies set higher in the path', function*() {
+    it('can delete cookies set higher in the path', async function() {
       var cookie = createCookieSpec();
       var childUrl = fileserver.whereIs('child/childPage.html');
       var grandchildUrl = fileserver.whereIs(
           'child/grandchild/grandchildPage.html');
 
-      yield driver.get(childUrl);
-      yield driver.manage().addCookie(cookie);
-      yield assertHasCookies(cookie);
+      await driver.get(childUrl);
+      await driver.manage().addCookie(cookie);
+      await assertHasCookies(cookie);
 
-      yield driver.get(grandchildUrl);
-      yield assertHasCookies(cookie);
+      await driver.get(grandchildUrl);
+      await assertHasCookies(cookie);
 
-      yield driver.manage().deleteCookie(cookie.name);
-      yield assertHasCookies();
+      await driver.manage().deleteCookie(cookie.name);
+      await assertHasCookies();
 
-      yield driver.get(childUrl);
-      yield assertHasCookies();
+      await driver.get(childUrl);
+      await assertHasCookies();
     });
 
-    test.ignore(env.browsers(
-        Browser.ANDROID,
+    ignore(env.browsers(
         Browser.FIREFOX,
-        'legacy-' + Browser.FIREFOX,
         Browser.IE)).
-    it('should retain cookie expiry', function*() {
+    it('should retain cookie expiry', async function() {
       let expirationDelay = 5 * 1000;
       let expiry = new Date(Date.now() + expirationDelay);
       let cookie = createCookieSpec({expiry});
 
-      yield driver.manage().addCookie(cookie);
-      yield driver.manage().getCookie(cookie.name).then(function(actual) {
+      await driver.manage().addCookie(cookie);
+      await driver.manage().getCookie(cookie.name).then(function(actual) {
         assert.equal(actual.value, cookie.value);
-        // expiry times are exchanged in seconds since January 1, 1970 UTC.
-        assert.equal(actual.expiry, Math.floor(expiry.getTime() / 1000));
+
+        // expiry times should be in seconds since January 1, 1970 UTC
+        try {
+          assert.equal(actual.expiry, Math.floor(expiry.getTime() / 1000));
+          assert.notEqual(
+              env.browser.name, Browser.SAFARI,
+              'Safari cookie expiry fixed; update test');
+        } catch (ex) {
+          if (env.browser.name !== Browser.SAFARI
+              || !(ex instanceof assert.AssertionError)) {
+            throw ex;
+          }
+
+          // Safari returns milliseconds (and is off by a few seconds...)
+          let diff = Math.abs(actual.expiry - expiry.getTime());
+          if (diff > 2000) {
+            assert.fail(
+                actual.expiry, expiry.getTime(),
+                'Expect Safari to return expiry in millis since epoch ± 2s');
+          }
+        }
       });
 
-      yield driver.sleep(expirationDelay);
-      yield assertHasCookies();
+      await driver.sleep(expirationDelay);
+      await assertHasCookies();
     });
   });