selenium-webdriver 3.3.0 → 4.0.0-alpha.1

package/lib/test/fileserver.js

@@ -17,26 +17,28 @@
 
 'use strict';
 
-var fs = require('fs'),
-    http = require('http'),
-    path = require('path'),
-    url = require('url');
+const fs = require('fs');
+const http = require('http');
+const path = require('path');
+const url = require('url');
 
-var express = require('express');
-var multer = require('multer');
-var serveIndex = require('serve-index');
+const express = require('express');
+const multer = require('multer');
+const serveIndex = require('serve-index');
 
-var Server = require('./httpserver').Server,
-    resources = require('./resources'),
-    isDevMode = require('../devmode');
+const isDevMode = require('../devmode');
+const resources = require('./resources');
+const {Server} = require('./httpserver');
 
-var WEB_ROOT = '/common';
-var JS_ROOT = '/javascript';
+const WEB_ROOT = '/common';
+const DATA_ROOT = '/data';
+const JS_ROOT = '/javascript';
 
-var baseDirectory = resources.locate(isDevMode ? 'common/src/web' : '.');
-var jsDirectory = resources.locate(isDevMode ? 'javascript' : '..');
+const baseDirectory = resources.locate(isDevMode ? 'common/src/web' : '.');
+const dataDirectory = path.join(__dirname, 'data');
+const jsDirectory = resources.locate(isDevMode ? 'javascript' : '..');
 
-var Pages = (function() {
+const Pages = (function() {
   var pages = {};
   function addPage(page, path) {
     pages.__defineGetter__(page, function() {
@@ -105,7 +107,7 @@ var Pages = (function() {
 })();
 
 
-var Path = {
+const Path = {
   BASIC_AUTH: WEB_ROOT + '/basicAuth',
   ECHO: WEB_ROOT + '/echo',
   GENERATED: WEB_ROOT + '/generated',
@@ -126,6 +128,7 @@ app.get('/', sendIndex)
 .use(JS_ROOT, serveIndex(jsDirectory), express.static(jsDirectory))
 .post(Path.UPLOAD, handleUpload)
 .use(WEB_ROOT, serveIndex(baseDirectory), express.static(baseDirectory))
+.use(DATA_ROOT, serveIndex(dataDirectory), express.static(dataDirectory))
 .get(Path.ECHO, sendEcho)
 .get(Path.PAGE, sendInifinitePage)
 .get(Path.PAGE + '/*', sendInifinitePage)
@@ -250,7 +253,8 @@ function sendIndex(request, response) {
   }
 
   var data = ['<!DOCTYPE html><h1>/</h1><hr/><ul>',
-              createListEntry('common')];
+              createListEntry('common'),
+              createListEntry('data')];
   if (isDevMode) {
     data.push(createListEntry('javascript'));
   }
@@ -305,9 +309,9 @@ exports.url = server.url.bind(server);
 exports.whereIs = function(filePath) {
   filePath = filePath.replace(/\\/g, '/');
   if (!filePath.startsWith('/')) {
-    filePath = '/' + filePath;
+    filePath = `${WEB_ROOT}/${filePath}`;
   }
-  return server.url(WEB_ROOT + filePath);
+  return server.url(filePath);
 };
 
 

package/lib/test/index.js

@@ -17,264 +17,55 @@
 
 'use strict';
 
-var assert = require('assert');
+const assert = require('assert');
 
-var build = require('./build'),
-    isDevMode = require('../devmode'),
-    webdriver = require('../../'),
-    flow = webdriver.promise.controlFlow(),
-    firefox = require('../../firefox'),
-    logging = require('../../lib/logging'),
-    safari = require('../../safari'),
-    remote = require('../../remote'),
-    testing = require('../../testing'),
-    fileserver = require('./fileserver');
+const build = require('./build');
+const fileserver = require('./fileserver');
+const firefox = require('../../firefox');
+const isDevMode = require('../devmode');
+const logging = require('../../lib/logging');
+const remote = require('../../remote');
+const safari = require('../../safari');
+const testing = require('../../testing');
+const webdriver = require('../../');
 
-
-const LEGACY_FIREFOX = 'legacy-' + webdriver.Browser.FIREFOX;
+const NO_BUILD = /^1|true$/i.test(process.env['SELENIUM_NO_BUILD']);
 
 
 /**
- * Browsers with native support.
- * @type {!Array.<webdriver.Browser>}
+ * @param {function(!testing.Environment)} fn The top level suite function.
+ * @param {testing.SuiteOptions=} options Suite specific options.
  */
-var NATIVE_BROWSERS = [
-  webdriver.Browser.CHROME,
-  webdriver.Browser.EDGE,
-  webdriver.Browser.FIREFOX,
-  LEGACY_FIREFOX,
-  webdriver.Browser.IE,
-  webdriver.Browser.OPERA,
-  webdriver.Browser.PHANTOM_JS,
-  webdriver.Browser.SAFARI
-];
-
-
-var serverJar = process.env['SELENIUM_SERVER_JAR'];
-var remoteUrl = process.env['SELENIUM_REMOTE_URL'];
-var useLoopback = process.env['SELENIUM_USE_LOOP_BACK'] == '1';
-var noMarionette = /^0|false$/i.test(process.env['SELENIUM_GECKODRIVER']);
-var startServer = !!serverJar && !remoteUrl;
-var nativeRun = !serverJar && !remoteUrl;
-
-if (/^1|true$/i.test(process.env['SELENIUM_VERBOSE'])) {
-  logging.installConsoleHandler();
-  logging.getLogger('webdriver.http').setLevel(logging.Level.ALL);
-}
-
-var browsersToTest = (function() {
-  var permitRemoteBrowsers = !!remoteUrl || !!serverJar;
-  var permitUnknownBrowsers = !nativeRun;
-  var browsers = process.env['SELENIUM_BROWSER'] || webdriver.Browser.FIREFOX;
-
-  browsers = browsers.split(',').map(function(browser) {
-    var parts = browser.split(/:/);
-    if (parts[0] === 'ie') {
-      parts[0] = webdriver.Browser.IE;
-    }
-    if (parts[0] === 'edge') {
-      parts[0] = webdriver.Browser.EDGE;
-    }
-    if (noMarionette && parts[0] === webdriver.Browser.FIREFOX) {
-      parts[0] = LEGACY_FIREFOX;
-    }
-    return parts.join(':');
-  });
-
-  browsers.forEach(function(browser) {
-    var parts = browser.split(/:/, 3);
-    if (parts[0] === 'ie') {
-      parts[0] = webdriver.Browser.IE;
-    }
-
-    if (parts[0] === LEGACY_FIREFOX) {
-      return;
-    }
-
-    if (NATIVE_BROWSERS.indexOf(parts[0]) == -1 && !permitRemoteBrowsers) {
-      throw Error('Browser ' + parts[0] + ' requires a WebDriver server and ' +
-          'neither the SELENIUM_REMOTE_URL nor the SELENIUM_SERVER_JAR ' +
-          'environment variables have been set.');
-    }
-
-    var recognized = false;
-    for (var prop in webdriver.Browser) {
-      if (webdriver.Browser.hasOwnProperty(prop) &&
-          webdriver.Browser[prop] === parts[0]) {
-        recognized = true;
-        break;
-      }
-    }
-
-    if (!recognized && !permitUnknownBrowsers) {
-      throw Error('Unrecognized browser: ' + browser);
-    }
-  });
-
-  console.log('Running tests against [' + browsers.join(',') + ']');
-  if (remoteUrl) {
-    console.log('Using remote server ' + remoteUrl);
-  } else if (serverJar) {
-    console.log('Using standalone Selenium server ' + serverJar);
-    if (useLoopback) {
-      console.log('Running tests using loopback address')
-    }
-  }
-  console.log(
-      'Promise manager is enabled? ' + webdriver.promise.USE_PROMISE_MANAGER);
-
-  return browsers;
-})();
-
-
-/**
- * Creates a predicate function that ignores tests for specific browsers.
- * @param {string} currentBrowser The name of the current browser.
- * @param {!Array.<!Browser>} browsersToIgnore The browsers to ignore.
- * @return {function(): boolean} The predicate function.
- */
-function browsers(currentBrowser, browsersToIgnore) {
-  return function() {
-    return browsersToIgnore.indexOf(currentBrowser) != -1;
-  };
-}
-
-
-/**
- * @param {string} browserName The name to use.
- * @param {remote.DriverService} server The server to use, if any.
- * @constructor
- */
-function TestEnvironment(browserName, server) {
-  var name = browserName;
-
-  this.currentBrowser = function() {
-    return browserName;
-  };
-
-  this.isRemote = function() {
-    return server || remoteUrl;
-  };
-
-  this.isMarionette = function() {
-    return !noMarionette;
-  };
-
-  this.browsers = function(var_args) {
-    var browsersToIgnore = Array.prototype.slice.apply(arguments, [0]);
-    return browsers(browserName, browsersToIgnore);
-  };
-
-  this.builder = function() {
-    var builder = new webdriver.Builder();
-    var realBuild = builder.build;
-
-    builder.build = function() {
-      var parts = browserName.split(/:/, 3);
-
-      if (parts[0] === LEGACY_FIREFOX) {
-        var options = builder.getFirefoxOptions() || new firefox.Options();
-        options.useGeckoDriver(false);
-        builder.setFirefoxOptions(options);
-
-        parts[0] = webdriver.Browser.FIREFOX;
-      }
-
-      builder.forBrowser(parts[0], parts[1], parts[2]);
-      if (server) {
-        builder.usingServer(server.address());
-      } else if (remoteUrl) {
-        builder.usingServer(remoteUrl);
-      }
-
-      builder.disableEnvironmentOverrides();
-      return realBuild.call(builder);
-    };
-
-    return builder;
-  };
-}
-
-
-var seleniumServer;
-var inSuite = false;
-
-
-/**
- * Expands a function to cover each of the target browsers.
- * @param {function(!TestEnvironment)} fn The top level suite
- *     function.
- * @param {{browsers: !Array.<string>}=} opt_options Suite specific options.
- */
-function suite(fn, opt_options) {
-  assert.ok(!inSuite, 'You may not nest suite calls');
-  inSuite = true;
-
-  var suiteOptions = opt_options || {};
-  var browsers = suiteOptions.browsers;
-  if (browsers) {
-    // Filter out browser specific tests when that browser is not currently
-    // selected for testing.
-    browsers = browsers.filter(function(browser) {
-      return browsersToTest.indexOf(browser) != -1;
-    });
-  } else {
-    browsers = browsersToTest;
-  }
-
-  try {
-
+function suite(fn, options = undefined) {
+  testing.suite(function(env) {
     before(function() {
-      if (isDevMode) {
+      if (isDevMode && !NO_BUILD) {
         return build.of(
             '//javascript/atoms/fragments:is-displayed',
-            '//javascript/webdriver/atoms:getAttribute')
+            '//javascript/webdriver/atoms:get-attribute')
             .onlyOnce().go();
       }
     });
 
-    // Server is only started if required for a specific config.
-    after(function() {
-      if (seleniumServer) {
-        return seleniumServer.stop();
-      }
-    });
+    fn(env);
+  }, options);
+}
 
-    browsers.forEach(function(browser) {
-      describe('[' + browser + ']', function() {
 
-        if (isDevMode && nativeRun) {
-          if (browser === LEGACY_FIREFOX) {
-            before(function() {
-              return build.of('//javascript/firefox-driver:webdriver')
-                  .onlyOnce().go();
-            });
-          }
-        }
+// GLOBAL TEST SETUP
 
-        var serverToUse = null;
 
-        if (!!serverJar && !remoteUrl) {
-          if (!(serverToUse = seleniumServer)) {
-            serverToUse = seleniumServer = new remote.SeleniumServer(
-                serverJar, {loopback: useLoopback});
-          }
+process.on('unhandledRejection', (reason) => {
+  console.error('Unhandled promise rejection:', reason);
+});
 
-          before(function() {
-            this.timeout(0);
-            return seleniumServer.start(60 * 1000);
-          });
-        }
-        fn(new TestEnvironment(browser, serverToUse));
-      });
-    });
-  } finally {
-    inSuite = false;
-  }
-}
 
+if (/^1|true$/i.test(process.env['SELENIUM_VERBOSE'])) {
+  logging.installConsoleHandler();
+  logging.getLogger('webdriver.http').setLevel(logging.Level.ALL);
+}
 
-// GLOBAL TEST SETUP
+testing.init();
 
 before(function() {
    // Do not pass register fileserver.start directly with testing.before,
@@ -287,16 +78,11 @@ after(function() {
    return fileserver.stop();
 });
 
+
 // PUBLIC API
 
 
 exports.suite = suite;
-exports.after = testing.after;
-exports.afterEach = testing.afterEach;
-exports.before = testing.before;
-exports.beforeEach = testing.beforeEach;
-exports.it = testing.it;
 exports.ignore = testing.ignore;
-
 exports.Pages = fileserver.Pages;
 exports.whereIs = fileserver.whereIs;

package/lib/test/resources.js

@@ -30,7 +30,6 @@ var resourceRoot = require('../devmode') ?
 
 /**
  * Locates a test resource.
- * @param {string} resourcePath Path of the resource to locate.
  * @param {string} filePath The file to locate from the root of the project.
  * @return {string} The full path for the file, if it exists.
  * @throws {Error} If the file does not exist.