From bd65bb67e25a79b019d745b7262b2008ce2adb15 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Wed, 16 Nov 2016 01:59:39 +0100
Subject: incrementally verify denoms

The denominations are not stored in a separate object store.
---
 node_modules/selenium-webdriver/lib/test/build.js  | 54 +++++++++++-----------
 .../selenium-webdriver/lib/test/data/formPage.html |  1 +
 .../selenium-webdriver/lib/test/fileserver.js      | 22 +++++----
 .../selenium-webdriver/lib/test/httpserver.js      | 10 ++--
 node_modules/selenium-webdriver/lib/test/index.js  | 43 ++++++++---------
 5 files changed, 62 insertions(+), 68 deletions(-)

(limited to 'node_modules/selenium-webdriver/lib/test')

diff --git a/node_modules/selenium-webdriver/lib/test/build.js b/node_modules/selenium-webdriver/lib/test/build.js
index 59f0b1357..53b284ffb 100644
--- a/node_modules/selenium-webdriver/lib/test/build.js
+++ b/node_modules/selenium-webdriver/lib/test/build.js
@@ -21,8 +21,7 @@ const spawn = require('child_process').spawn,
     fs = require('fs'),
     path = require('path');
 
-const isDevMode = require('../devmode'),
-    promise = require('../promise');
+const isDevMode = require('../devmode');
 
 var projectRoot = path.normalize(path.join(__dirname, '../../../../..'));
 
@@ -69,7 +68,7 @@ Build.prototype.onlyOnce = function() {
 
 /**
  * Executes the build.
- * @return {!webdriver.promise.Promise} A promise that will be resolved when
+ * @return {!Promise} A promise that will be resolved when
  *     the build has completed.
  * @throws {Error} If no targets were specified.
  */
@@ -86,7 +85,7 @@ Build.prototype.go = function() {
     });
 
     if (!targets.length) {
-      return promise.fulfilled();
+      return Promise.resolve();
     }
   }
 
@@ -100,31 +99,30 @@ Build.prototype.go = function() {
     cmd = path.join(projectRoot, 'go');
   }
 
-  var result = promise.defer();
-  spawn(cmd, args, {
-    cwd: projectRoot,
-    env: process.env,
-    stdio: ['ignore', process.stdout, process.stderr]
-  }).on('exit', function(code, signal) {
-    if (code === 0) {
-      targets.forEach(function(target) {
-        builtTargets[target] = 1;
-      });
-      return result.fulfill();
-    }
-
-    var msg = 'Unable to build artifacts';
-    if (code) {  // May be null.
-      msg += '; code=' + code;
-    }
-    if (signal) {
-      msg += '; signal=' + signal;
-    }
-
-    result.reject(Error(msg));
+  return new Promise((resolve, reject) => {
+    spawn(cmd, args, {
+      cwd: projectRoot,
+      env: process.env,
+      stdio: ['ignore', process.stdout, process.stderr]
+    }).on('exit', function(code, signal) {
+      if (code === 0) {
+        targets.forEach(function(target) {
+          builtTargets[target] = 1;
+        });
+        return resolve();
+      }
+
+      var msg = 'Unable to build artifacts';
+      if (code) {  // May be null.
+        msg += '; code=' + code;
+      }
+      if (signal) {
+        msg += '; signal=' + signal;
+      }
+
+      reject(Error(msg));
+    });
   });
-
-  return result.promise;
 };
 
 
diff --git a/node_modules/selenium-webdriver/lib/test/data/formPage.html b/node_modules/selenium-webdriver/lib/test/data/formPage.html
index 7bcfea00f..45ae2b7d6 100644
--- a/node_modules/selenium-webdriver/lib/test/data/formPage.html
+++ b/node_modules/selenium-webdriver/lib/test/data/formPage.html
@@ -45,6 +45,7 @@ There should be a form here:
 
     <select name="no-select" disabled="disabled">
       <option value="foo">Foo</option>
+      <option value="bar">Bar</option>
     </select>
 
 		<select name="select_empty_multiple" multiple>
diff --git a/node_modules/selenium-webdriver/lib/test/fileserver.js b/node_modules/selenium-webdriver/lib/test/fileserver.js
index 448b0c9a2..8194778ea 100644
--- a/node_modules/selenium-webdriver/lib/test/fileserver.js
+++ b/node_modules/selenium-webdriver/lib/test/fileserver.js
@@ -28,8 +28,7 @@ var serveIndex = require('serve-index');
 
 var Server = require('./httpserver').Server,
     resources = require('./resources'),
-    isDevMode = require('../devmode'),
-    promise = require('../promise');
+    isDevMode = require('../devmode');
 
 var WEB_ROOT = '/common';
 var JS_ROOT = '/javascript';
@@ -194,15 +193,18 @@ function sendDelayedResponse(request, response) {
 }
 
 
-function handleUpload(request, response, next) {
-  multer({
-    inMemory: true,
-    onFileUploadComplete: function(file) {
+function handleUpload(request, response) {
+  let upload = multer({storage: multer.memoryStorage()}).any();
+  upload(request, response, function(err) {
+    if (err) {
+      response.writeHead(500);
+      response.end(err + '');
+    } else {
       response.writeHead(200);
-      response.write(file.buffer);
+      response.write(request.files[0].buffer);
       response.end('<script>window.top.window.onUploadDone();</script>');
     }
-  })(request, response, function() {});
+  });
 }
 
 
@@ -269,7 +271,7 @@ function sendIndex(request, response) {
 /**
  * Starts the server on the specified port.
  * @param {number=} opt_port The port to use, or 0 for any free port.
- * @return {!webdriver.promise.Promise.<Host>} A promise that will resolve
+ * @return {!Promise<Host>} A promise that will resolve
  *     with the server host when it has fully started.
  */
 exports.start = server.start.bind(server);
@@ -277,7 +279,7 @@ exports.start = server.start.bind(server);
 
 /**
  * Stops the server.
- * @return {!webdriver.promise.Promise} A promise that will resolve when the
+ * @return {!Promise} A promise that will resolve when the
  *     server has closed all connections.
  */
 exports.stop = server.stop.bind(server);
diff --git a/node_modules/selenium-webdriver/lib/test/httpserver.js b/node_modules/selenium-webdriver/lib/test/httpserver.js
index 55b12551f..f7847f734 100644
--- a/node_modules/selenium-webdriver/lib/test/httpserver.js
+++ b/node_modules/selenium-webdriver/lib/test/httpserver.js
@@ -50,14 +50,14 @@ var Server = function(requestHandler) {
    * Starts the server on the given port. If no port, or 0, is provided,
    * the server will be started on a random port.
    * @param {number=} opt_port The port to start on.
-   * @return {!webdriver.promise.Promise.<Host>} A promise that will resolve
+   * @return {!Promise<Host>} A promise that will resolve
    *     with the server host when it has fully started.
    */
   this.start = function(opt_port) {
     assert(typeof opt_port !== 'function',
            "start invoked with function, not port (mocha callback)?");
     var port = opt_port || portprober.findFreePort('localhost');
-    return promise.when(port, function(port) {
+    return Promise.resolve(port).then(port => {
       return promise.checkedNodeCall(
           server.listen.bind(server, port, 'localhost'));
     }).then(function() {
@@ -67,13 +67,11 @@ var Server = function(requestHandler) {
 
   /**
    * Stops the server.
-   * @return {!webdriver.promise.Promise} A promise that will resolve when the
+   * @return {!Promise} A promise that will resolve when the
    *     server has closed all connections.
    */
   this.stop = function() {
-    var d = promise.defer();
-    server.close(d.fulfill);
-    return d.promise;
+    return new Promise(resolve => server.close(resolve));
   };
 
   /**
diff --git a/node_modules/selenium-webdriver/lib/test/index.js b/node_modules/selenium-webdriver/lib/test/index.js
index d702c5fb2..ba34ddab4 100644
--- a/node_modules/selenium-webdriver/lib/test/index.js
+++ b/node_modules/selenium-webdriver/lib/test/index.js
@@ -31,7 +31,6 @@ var build = require('./build'),
 
 
 const LEGACY_FIREFOX = 'legacy-' + webdriver.Browser.FIREFOX;
-const LEGACY_SAFARI = 'legacy-' + webdriver.Browser.SAFARI;
 
 
 /**
@@ -46,8 +45,7 @@ var NATIVE_BROWSERS = [
   webdriver.Browser.IE,
   webdriver.Browser.OPERA,
   webdriver.Browser.PHANTOM_JS,
-  webdriver.Browser.SAFARI,
-  LEGACY_SAFARI
+  webdriver.Browser.SAFARI
 ];
 
 
@@ -83,8 +81,7 @@ var browsersToTest = (function() {
       parts[0] = webdriver.Browser.IE;
     }
 
-    if (parts[0] === LEGACY_FIREFOX ||
-      parts[0] === LEGACY_SAFARI) {
+    if (parts[0] === LEGACY_FIREFOX) {
       return;
     }
 
@@ -117,6 +114,8 @@ var browsersToTest = (function() {
       console.log('Running tests using loopback address')
     }
   }
+  console.log(
+      'Promise manager is enabled? ' + webdriver.promise.USE_PROMISE_MANAGER);
 
   return browsers;
 })();
@@ -175,14 +174,6 @@ function TestEnvironment(browserName, server) {
         parts[0] = webdriver.Browser.FIREFOX;
       }
 
-      if (parts[0] === LEGACY_SAFARI) {
-        var options = builder.getSafariOptions() || new safari.Options();
-        options.useLegacyDriver(true);
-        builder.setSafariOptions(options);
-
-        parts[0] = webdriver.Browser.SAFARI;
-      }
-
       builder.forBrowser(parts[0], parts[1], parts[2]);
       if (server) {
         builder.usingServer(server.address());
@@ -227,27 +218,31 @@ function suite(fn, opt_options) {
 
   try {
 
+    before(function() {
+      if (isDevMode) {
+        return build.of(
+            '//javascript/atoms/fragments:is-displayed',
+            '//javascript/webdriver/atoms:getAttribute')
+            .onlyOnce().go();
+      }
+    });
+
     // Server is only started if required for a specific config.
-    testing.after(function() {
+    after(function() {
       if (seleniumServer) {
         return seleniumServer.stop();
       }
     });
 
     browsers.forEach(function(browser) {
-      testing.describe('[' + browser + ']', function() {
+      describe('[' + browser + ']', function() {
 
         if (isDevMode && nativeRun) {
           if (browser === LEGACY_FIREFOX) {
-            testing.before(function() {
+            before(function() {
               return build.of('//javascript/firefox-driver:webdriver')
                   .onlyOnce().go();
             });
-          } else if (browser === LEGACY_SAFARI) {
-            testing.before(function() {
-              return build.of('//javascript/safari-driver:client')
-                  .onlyOnce().go();
-            });
           }
         }
 
@@ -259,7 +254,7 @@ function suite(fn, opt_options) {
                 serverJar, {loopback: useLoopback});
           }
 
-          testing.before(function() {
+          before(function() {
             this.timeout(0);
             return seleniumServer.start(60 * 1000);
           });
@@ -275,14 +270,14 @@ function suite(fn, opt_options) {
 
 // GLOBAL TEST SETUP
 
-testing.before(function() {
+before(function() {
    // Do not pass register fileserver.start directly with testing.before,
    // as start takes an optional port, which before assumes is an async
    // callback.
    return fileserver.start();
 });
 
-testing.after(function() {
+after(function() {
    return fileserver.stop();
 });
 
-- 
cgit v1.2.3