diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-11-16 01:59:39 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-11-16 02:00:31 +0100 |
commit | bd65bb67e25a79b019d745b7262b2008ce2adb15 (patch) | |
tree | 89e1b032103a63737f1a703e6a943832ef261704 /node_modules/selenium-webdriver/lib/test/fileserver.js | |
parent | f91466595b651721690133f58ab37f977539e95b (diff) |
incrementally verify denoms
The denominations are not stored in a separate object store.
Diffstat (limited to 'node_modules/selenium-webdriver/lib/test/fileserver.js')
-rw-r--r-- | node_modules/selenium-webdriver/lib/test/fileserver.js | 22 |
1 files changed, 12 insertions, 10 deletions
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); |