selenium-webdriver 3.0.0-beta-1 → 3.0.1

package/test/logging_test.js

@@ -40,125 +40,123 @@ test.suite(function(env) {
       driver = null;
     });
 
-    test.afterEach(function() {
+    test.afterEach(function*() {
       if (driver) {
-        driver.quit();
+        return driver.quit();
       }
     });
 
-    test.it('can be disabled', function() {
+    test.it('can be disabled', function*() {
       var prefs = new logging.Preferences();
       prefs.setLevel(logging.Type.BROWSER, logging.Level.OFF);
 
-      driver = env.builder()
+      driver = yield env.builder()
           .setLoggingPrefs(prefs)
           .build();
 
-      driver.get(dataUrl(
+      yield driver.get(dataUrl(
           '<!DOCTYPE html><script>',
           'console.info("hello");',
           'console.warn("this is a warning");',
           'console.error("and this is an error");',
           '</script>'));
-      driver.manage().logs().get(logging.Type.BROWSER).then(function(entries) {
-        assert(entries.length).equalTo(0);
-      });
+      return driver.manage().logs().get(logging.Type.BROWSER)
+          .then(entries => assert(entries.length).equalTo(0));
     });
 
     // Firefox does not capture JS error console log messages.
     test.ignore(env.browsers(Browser.FIREFOX, 'legacy-firefox')).
-    it('can be turned down', function() {
+    it('can be turned down', function*() {
       var prefs = new logging.Preferences();
       prefs.setLevel(logging.Type.BROWSER, logging.Level.SEVERE);
 
-      driver = env.builder()
+      driver = yield env.builder()
           .setLoggingPrefs(prefs)
           .build();
 
-      driver.get(dataUrl(
+      yield driver.get(dataUrl(
           '<!DOCTYPE html><script>',
           'console.info("hello");',
           'console.warn("this is a warning");',
           'console.error("and this is an error");',
           '</script>'));
-      driver.manage().logs().get(logging.Type.BROWSER).then(function(entries) {
-        assert(entries.length).equalTo(1);
-        assert(entries[0].level.name).equalTo('SEVERE');
-        assert(entries[0].message).endsWith('and this is an error');
-      });
+      return driver.manage().logs().get(logging.Type.BROWSER)
+          .then(function(entries) {
+            assert(entries.length).equalTo(1);
+            assert(entries[0].level.name).equalTo('SEVERE');
+            assert(entries[0].message).matches(/.*\"?and this is an error\"?/);
+          });
     });
 
     // Firefox does not capture JS error console log messages.
     test.ignore(env.browsers(Browser.FIREFOX, 'legacy-firefox')).
-    it('can be made verbose', function() {
+    it('can be made verbose', function*() {
       var prefs = new logging.Preferences();
       prefs.setLevel(logging.Type.BROWSER, logging.Level.DEBUG);
 
-      driver = env.builder()
+      driver = yield env.builder()
           .setLoggingPrefs(prefs)
           .build();
 
-      driver.get(dataUrl(
+      yield driver.get(dataUrl(
           '<!DOCTYPE html><script>',
           'console.debug("hello");',
           'console.warn("this is a warning");',
           'console.error("and this is an error");',
           '</script>'));
-      driver.manage().logs().get(logging.Type.BROWSER).then(function(entries) {
-        assert(entries.length).equalTo(3);
-        assert(entries[0].level.name).equalTo('DEBUG');
-        assert(entries[0].message).endsWith('hello');
-
-        assert(entries[1].level.name).equalTo('WARNING');
-        assert(entries[1].message).endsWith('this is a warning');
-
-        assert(entries[2].level.name).equalTo('SEVERE');
-        assert(entries[2].message).endsWith('and this is an error');
-      });
+      return driver.manage().logs().get(logging.Type.BROWSER)
+          .then(function(entries) {
+            assert(entries.length).equalTo(3);
+            assert(entries[0].level.name).equalTo('DEBUG');
+            assert(entries[0].message).matches(/.*\"?hello\"?/);
+
+            assert(entries[1].level.name).equalTo('WARNING');
+            assert(entries[1].message).matches(/.*\"?this is a warning\"?/);
+
+            assert(entries[2].level.name).equalTo('SEVERE');
+            assert(entries[2].message).matches(/.*\"?and this is an error\"?/);
+          });
     });
 
     // Firefox does not capture JS error console log messages.
     test.ignore(env.browsers(Browser.FIREFOX, 'legacy-firefox')).
-    it('clears records after retrieval', function() {
+    it('clears records after retrieval', function*() {
       var prefs = new logging.Preferences();
       prefs.setLevel(logging.Type.BROWSER, logging.Level.DEBUG);
 
-      driver = env.builder()
+      driver = yield env.builder()
           .setLoggingPrefs(prefs)
           .build();
 
-      driver.get(dataUrl(
+      yield driver.get(dataUrl(
           '<!DOCTYPE html><script>',
           'console.debug("hello");',
           'console.warn("this is a warning");',
           'console.error("and this is an error");',
           '</script>'));
-      driver.manage().logs().get(logging.Type.BROWSER).then(function(entries) {
-        assert(entries.length).equalTo(3);
-      });
-      driver.manage().logs().get(logging.Type.BROWSER).then(function(entries) {
-        assert(entries.length).equalTo(0);
-      });
+      yield driver.manage().logs().get(logging.Type.BROWSER)
+          .then(entries => assert(entries.length).equalTo(3));
+      return driver.manage().logs().get(logging.Type.BROWSER)
+          .then(entries => assert(entries.length).equalTo(0));
     });
 
-    test.it('does not mix log types', function() {
+    test.it('does not mix log types', function*() {
       var prefs = new logging.Preferences();
       prefs.setLevel(logging.Type.BROWSER, logging.Level.DEBUG);
       prefs.setLevel(logging.Type.DRIVER, logging.Level.SEVERE);
 
-      driver = env.builder()
+      driver = yield env.builder()
           .setLoggingPrefs(prefs)
           .build();
 
-      driver.get(dataUrl(
+      yield driver.get(dataUrl(
           '<!DOCTYPE html><script>',
           'console.debug("hello");',
           'console.warn("this is a warning");',
           'console.error("and this is an error");',
           '</script>'));
-      driver.manage().logs().get(logging.Type.DRIVER).then(function(entries) {
-        assert(entries.length).equalTo(0);
-      });
+      return driver.manage().logs().get(logging.Type.DRIVER)
+          .then(entries => assert(entries.length).equalTo(0));
     });
   });
 

package/test/net/portprober_test.js

@@ -17,11 +17,10 @@
 
 'use strict';
 
-var assert = require('assert'),
-    net = require('net');
+const assert = require('assert');
+const net = require('net');
 
-var promise = require('../..').promise,
-    portprober = require('../../net/portprober');
+const portprober = require('../../net/portprober');
 
 describe('isFree', function() {
 
@@ -42,12 +41,12 @@ describe('isFree', function() {
     server.listen(0, function() {
       var port = server.address().port;
       assertPortNotfree(port).then(function() {
-        var done = promise.defer();
-        server.close(function() {
-          server = null;
-          done.fulfill(assertPortIsFree(port));
+        return new Promise(resolve => {
+          server.close(function() {
+            server = null;
+            resolve(assertPortIsFree(port));
+          });
         });
-        return done.promise;
       }).then(function() { done(); }, done);
     });
   });
@@ -57,12 +56,12 @@ describe('isFree', function() {
     server.listen(0, host, function() {
       var port = server.address().port;
       assertPortNotfree(port, host).then(function() {
-        var done = promise.defer();
-        server.close(function() {
-          server = null;
-          done.fulfill(assertPortIsFree(port, host));
+        return new Promise(resolve => {
+          server.close(function() {
+            server = null;
+            resolve(assertPortIsFree(port, host));
+          });
         });
-        return done.promise;
       }).then(function() { done(); }, done);
     });
   });
@@ -86,12 +85,12 @@ describe('findFreePort', function() {
     portprober.findFreePort().then(function(port) {
       server.listen(port, function() {
         assertPortNotfree(port).then(function() {
-          var done = promise.defer();
-          server.close(function() {
-            server = null;
-            done.fulfill(assertPortIsFree(port));
+          return new Promise(resolve => {
+            server.close(function() {
+              server = null;
+              resolve(assertPortIsFree(port));
+            });
           });
-          return done.promise;
         }).then(function() { done(); }, done);
       });
     });
@@ -102,12 +101,12 @@ describe('findFreePort', function() {
     portprober.findFreePort(host).then(function(port) {
       server.listen(port, host, function() {
         assertPortNotfree(port, host).then(function() {
-          var done = promise.defer();
-          server.close(function() {
-            server = null;
-            done.fulfill(assertPortIsFree(port, host));
+          return new Promise(resolve => {
+            server.close(function() {
+              server = null;
+              resolve(assertPortIsFree(port, host));
+            });
           });
-          return done.promise;
         }).then(function() { done(); }, done);
       });
     });

package/test/page_loading_test.js

@@ -30,122 +30,136 @@ test.suite(function(env) {
   var browsers = env.browsers;
 
   var driver;
-  test.before(function() {
-    driver = env.builder().build();
+  test.before(function*() {
+    driver = yield env.builder().build();
+  });
+
+  test.beforeEach(function*() {
+    if (!driver) {
+      driver = yield env.builder().build();
+    }
   });
 
   test.after(function() {
-    driver.quit();
+    if (driver) {
+      return driver.quit();
+    }
   });
 
-  test.it('should wait for document to be loaded', function() {
-    driver.get(Pages.simpleTestPage);
-    assert(driver.getTitle()).equalTo('Hello WebDriver');
+  test.it('should wait for document to be loaded', function*() {
+    yield driver.get(Pages.simpleTestPage);
+    return assert(driver.getTitle()).equalTo('Hello WebDriver');
   });
 
   test.it('should follow redirects sent in the http response headers',
-      function() {
-    driver.get(Pages.redirectPage);
-    assert(driver.getTitle()).equalTo('We Arrive Here');
+      function*() {
+    yield driver.get(Pages.redirectPage);
+    return assert(driver.getTitle()).equalTo('We Arrive Here');
   });
 
-  test.it('should follow meta redirects', function() {
-    driver.get(Pages.metaRedirectPage);
-    assert(driver.getTitle()).equalTo('We Arrive Here');
+  test.ignore(browsers(Browser.SAFARI)).
+  it('should follow meta redirects', function*() {
+    yield driver.get(Pages.metaRedirectPage);
+    return assert(driver.getTitle()).equalTo('We Arrive Here');
   });
 
   // Skip Firefox; see https://bugzilla.mozilla.org/show_bug.cgi?id=1280300
   test.ignore(browsers(Browser.FIREFOX)).
-  it('should be able to get a fragment on the current page', function() {
-    driver.get(Pages.xhtmlTestPage);
-    driver.get(Pages.xhtmlTestPage + '#text');
-    driver.findElement(By.id('id1'));
+  it('should be able to get a fragment on the current page', function*() {
+    yield driver.get(Pages.xhtmlTestPage);
+    yield driver.get(Pages.xhtmlTestPage + '#text');
+    yield driver.findElement(By.id('id1'));
   });
 
   test.ignore(browsers(Browser.IPAD, Browser.IPHONE)).
-  it('should wait for all frames to load in a frameset', function() {
-    driver.get(Pages.framesetPage);
-    driver.switchTo().frame(0);
+  it('should wait for all frames to load in a frameset', function*() {
+    yield driver.get(Pages.framesetPage);
+    yield driver.switchTo().frame(0);
 
-    driver.findElement(By.css('span#pageNumber')).getText().then(function(txt) {
-      assert(txt.trim()).equalTo('1');
-    });
+    let txt = yield driver.findElement(By.css('span#pageNumber')).getText();
+    assert(txt.trim()).equalTo('1');
 
-    driver.switchTo().defaultContent();
-    driver.switchTo().frame(1);
-    driver.findElement(By.css('span#pageNumber')).getText().then(function(txt) {
-      assert(txt.trim()).equalTo('2');
-    });
+    yield driver.switchTo().defaultContent();
+    yield driver.switchTo().frame(1);
+    txt = yield driver.findElement(By.css('span#pageNumber')).getText();
+
+    assert(txt.trim()).equalTo('2');
   });
 
   test.ignore(browsers(Browser.SAFARI)).
-  it('should be able to navigate back in browser history', function() {
-    driver.get(Pages.formPage);
+  it('should be able to navigate back in browser history', function*() {
+    yield driver.get(Pages.formPage);
 
-    driver.findElement(By.id('imageButton')).click();
-    driver.wait(until.titleIs('We Arrive Here'), 2500);
+    yield driver.findElement(By.id('imageButton')).click();
+    yield driver.wait(until.titleIs('We Arrive Here'), 2500);
 
-    driver.navigate().back();
-    driver.wait(until.titleIs('We Leave From Here'), 2500);
+    yield driver.navigate().back();
+    yield driver.wait(until.titleIs('We Leave From Here'), 2500);
   });
 
   test.ignore(browsers(Browser.SAFARI)).
-  it('should be able to navigate back in presence of iframes', function() {
-    driver.get(Pages.xhtmlTestPage);
+  it('should be able to navigate back in presence of iframes', function*() {
+    yield driver.get(Pages.xhtmlTestPage);
 
-    driver.findElement(By.name('sameWindow')).click();
-    driver.wait(until.titleIs('This page has iframes'), 2500);
+    yield driver.findElement(By.name('sameWindow')).click();
+    yield driver.wait(until.titleIs('This page has iframes'), 2500);
 
-    driver.navigate().back();
-    driver.wait(until.titleIs('XHTML Test Page'), 2500);
+    yield driver.navigate().back();
+    yield driver.wait(until.titleIs('XHTML Test Page'), 2500);
   });
 
   test.ignore(browsers(Browser.SAFARI)).
-  it('should be able to navigate forwards in browser history', function() {
-    driver.get(Pages.formPage);
+  it('should be able to navigate forwards in browser history', function*() {
+    yield driver.get(Pages.formPage);
 
-    driver.findElement(By.id('imageButton')).click();
-    driver.wait(until.titleIs('We Arrive Here'), 5000);
+    yield driver.findElement(By.id('imageButton')).click();
+    yield driver.wait(until.titleIs('We Arrive Here'), 5000);
 
-    driver.navigate().back();
-    driver.wait(until.titleIs('We Leave From Here'), 5000);
+    yield driver.navigate().back();
+    yield driver.wait(until.titleIs('We Leave From Here'), 5000);
 
-    driver.navigate().forward();
-    driver.wait(until.titleIs('We Arrive Here'), 5000);
+    yield driver.navigate().forward();
+    yield driver.wait(until.titleIs('We Arrive Here'), 5000);
   });
 
   // PhantomJS 2.0 does not properly reload pages on refresh.
   test.ignore(browsers(Browser.PHANTOM_JS)).
-  it('should be able to refresh a page', function() {
-    driver.get(Pages.xhtmlTestPage);
+  it('should be able to refresh a page', function*() {
+    yield driver.get(Pages.xhtmlTestPage);
 
-    driver.navigate().refresh();
+    yield driver.navigate().refresh();
 
-    assert(driver.getTitle()).equalTo('XHTML Test Page');
+    yield assert(driver.getTitle()).equalTo('XHTML Test Page');
   });
 
-  test.it('should return title of page if set', function() {
-    driver.get(Pages.xhtmlTestPage);
-    assert(driver.getTitle()).equalTo('XHTML Test Page');
+  test.it('should return title of page if set', function*() {
+    yield driver.get(Pages.xhtmlTestPage);
+    yield assert(driver.getTitle()).equalTo('XHTML Test Page');
 
-    driver.get(Pages.simpleTestPage);
-    assert(driver.getTitle()).equalTo('Hello WebDriver');
+    yield driver.get(Pages.simpleTestPage);
+    yield assert(driver.getTitle()).equalTo('Hello WebDriver');
   });
 
-  // Only implemented in Firefox.
-  test.ignore(browsers(
-      Browser.CHROME,
-      Browser.IE,
-      Browser.IPAD,
-      Browser.IPHONE,
-      Browser.OPERA,
-      Browser.PHANTOM_JS,
-      Browser.SAFARI)).
-  it('should timeout if page load timeout is set', function() {
-    driver.call(function() {
-      driver.manage().timeouts().pageLoadTimeout(1);
-      driver.get(Pages.sleepingPage + '?time=3').
-          then(function() {
+  describe('timeouts', function() {
+    test.afterEach(function() {
+      let nullDriver = () => driver = null;
+      if (driver) {
+        return driver.quit().then(nullDriver, nullDriver);
+      }
+    });
+
+    // Only implemented in Firefox.
+    test.ignore(browsers(
+        Browser.CHROME,
+        Browser.IE,
+        Browser.IPAD,
+        Browser.IPHONE,
+        Browser.OPERA,
+        Browser.PHANTOM_JS)).
+    it('should timeout if page load timeout is set', function*() {
+      yield driver.manage().timeouts().pageLoadTimeout(1);
+      return driver.get(Pages.sleepingPage + '?time=3')
+          .then(function() {
             throw Error('Should have timed out on page load');
           }, function(e) {
             if (!(e instanceof error.ScriptTimeoutError)
@@ -153,14 +167,6 @@ test.suite(function(env) {
               throw Error('Unexpected error response: ' + e);
             }
           });
-    }).then(resetPageLoad, function(err) {
-      resetPageLoad().finally(function() {
-        throw err;
-      });
     });
-
-    function resetPageLoad() {
-      return driver.manage().timeouts().pageLoadTimeout(-1);
-    }
   });
 });

package/test/phantomjs/execute_phantomjs_test.js

@@ -24,49 +24,35 @@ var test = require('../../lib/test');
 test.suite(function(env) {
   var driver;
 
-  test.before(function() {
-    driver = env.builder().build();
+  test.before(function*() {
+    driver = yield env.builder().build();
   });
 
   test.after(function() {
-    driver.quit();
+    return driver.quit();
   });
 
   var testPageUrl =
       'data:text/html,<html><h1>' + path.basename(__filename) + '</h1></html>';
 
   test.beforeEach(function() {
-    driver.get(testPageUrl);
+    return driver.get(testPageUrl);
   });
 
   describe('phantomjs.Driver', function() {
     describe('#executePhantomJS()', function() {
 
-      test.it('can execute scripts using PhantomJS API', function() {
-        return driver.executePhantomJS('return this.url;').then(function(url) {
-          assert.equal(testPageUrl, decodeURIComponent(url));
-        });
+      test.it('can execute scripts using PhantomJS API', function*() {
+        let url = yield driver.executePhantomJS('return this.url;');
+        assert.equal(testPageUrl, decodeURIComponent(url));
       });
 
-      test.it('can execute scripts as functions', function() {
-        driver.executePhantomJS(function(a, b) {
+      test.it('can execute scripts as functions', function*() {
+        let result = yield driver.executePhantomJS(function(a, b) {
           return a + b;
-        }, 1, 2).then(function(result) {
-          assert.equal(3, result);
-        });
-      });
+        }, 1, 2);
 
-      test.it('can manipulate the current page', function() {
-        driver.manage().addCookie({name: 'foo', value: 'bar'});
-        driver.manage().getCookie('foo').then(function(cookie) {
-          assert.equal('bar', cookie.value);
-        });
-        driver.executePhantomJS(function() {
-          this.clearCookies();
-        });
-        driver.manage().getCookie('foo').then(function(cookie) {
-          assert.equal(null, cookie);
-        });
+        assert.equal(3, result);
       });
     });
   });

package/test/proxy_test.js

@@ -96,7 +96,7 @@ test.suite(function(env) {
 
   var driver;
   test.beforeEach(function() { driver = null; });
-  test.afterEach(function() { driver && driver.quit(); });
+  test.afterEach(function() { return driver && driver.quit(); });
 
   function createDriver(proxy) {
     // For Firefox we need to explicitly enable proxies for localhost by
@@ -104,7 +104,7 @@ test.suite(function(env) {
     let profile = new firefox.Profile();
     profile.setPreference('network.proxy.no_proxies_on', '');
 
-    driver = env.builder()
+    return driver = env.builder()
         .setFirefoxOptions(new firefox.Options().setProfile(profile))
         .setProxy(proxy)
         .build();
@@ -116,14 +116,14 @@ test.suite(function(env) {
     // phantomjs 1.9.1 in webdriver mode does not appear to respect proxy
     // settings.
     test.ignore(env.browsers(Browser.PHANTOM_JS)).
-    it('can configure HTTP proxy host', function() {
-      createDriver(proxy.manual({
+    it('can configure HTTP proxy host', function*() {
+      yield createDriver(proxy.manual({
         http: proxyServer.host()
       }));
 
-      driver.get(helloServer.url());
-      assert(driver.getTitle()).equalTo('Proxy page');
-      assert(driver.findElement({tagName: 'h3'}).getText()).
+      yield driver.get(helloServer.url());
+      yield assert(driver.getTitle()).equalTo('Proxy page');
+      yield assert(driver.findElement({tagName: 'h3'}).getText()).
           equalTo('This is the proxy landing page');
     });
 
@@ -134,20 +134,20 @@ test.suite(function(env) {
         Browser.FIREFOX,
         'legacy-' + Browser.FIREFOX,
         Browser.PHANTOM_JS)).
-    it('can bypass proxy for specific hosts', function() {
-      createDriver(proxy.manual({
+    it('can bypass proxy for specific hosts', function*() {
+      yield createDriver(proxy.manual({
         http: proxyServer.host(),
         bypass: helloServer.host()
       }));
 
-      driver.get(helloServer.url());
-      assert(driver.getTitle()).equalTo('Hello');
-      assert(driver.findElement({tagName: 'h3'}).getText()).
+      yield driver.get(helloServer.url());
+      yield assert(driver.getTitle()).equalTo('Hello');
+      yield assert(driver.findElement({tagName: 'h3'}).getText()).
           equalTo('Hello, world!');
 
-      driver.get(goodbyeServer.url());
-      assert(driver.getTitle()).equalTo('Proxy page');
-      assert(driver.findElement({tagName: 'h3'}).getText()).
+      yield driver.get(goodbyeServer.url());
+      yield assert(driver.getTitle()).equalTo('Proxy page');
+      yield assert(driver.findElement({tagName: 'h3'}).getText()).
           equalTo('This is the proxy landing page');
     });
 
@@ -159,17 +159,17 @@ test.suite(function(env) {
   test.ignore(env.browsers(
       Browser.IE, Browser.OPERA, Browser.PHANTOM_JS, Browser.SAFARI)).
   describe('pac proxy settings', function() {
-    test.it('can configure proxy through PAC file', function() {
-      createDriver(proxy.pac(proxyServer.url('/proxy.pac')));
+    test.it('can configure proxy through PAC file', function*() {
+      yield createDriver(proxy.pac(proxyServer.url('/proxy.pac')));
 
-      driver.get(helloServer.url());
-      assert(driver.getTitle()).equalTo('Proxy page');
-      assert(driver.findElement({tagName: 'h3'}).getText()).
+      yield driver.get(helloServer.url());
+      yield assert(driver.getTitle()).equalTo('Proxy page');
+      yield assert(driver.findElement({tagName: 'h3'}).getText()).
           equalTo('This is the proxy landing page');
 
-      driver.get(goodbyeServer.url());
-      assert(driver.getTitle()).equalTo('Goodbye');
-      assert(driver.findElement({tagName: 'h3'}).getText()).
+      yield driver.get(goodbyeServer.url());
+      yield assert(driver.getTitle()).equalTo('Goodbye');
+      yield assert(driver.findElement({tagName: 'h3'}).getText()).
           equalTo('Goodbye, world!');
     });
   });