From 4344968805118522fab7b101ba525b4e7974c020 Mon Sep 17 00:00:00 2001 From: sebv Date: Mon, 26 May 2014 18:23:02 +0800 Subject: [PATCH] upgraded all packages but express --- ci/tools/parallel-mocha.js | 2 +- package.json | 16 ++++++++-------- .../common/webview/implicit-wait-base.js | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/tools/parallel-mocha.js b/ci/tools/parallel-mocha.js index 788f5652cb4..9481041c559 100644 --- a/ci/tools/parallel-mocha.js +++ b/ci/tools/parallel-mocha.js @@ -84,7 +84,7 @@ var queue = async.queue(function (task, done) { .catch(function (err) { allGood = false; console.error(err + (err.out ? '\n' + err.out : '')); - }).fin(function () { clearInterval(interval); }) + }).finally(function () { clearInterval(interval); }) .nodeify(done); }, args.numOfWorkers); diff --git a/package.json b/package.json index bef81373865..db679fdbb80 100644 --- a/package.json +++ b/package.json @@ -51,19 +51,19 @@ "uuid-js": "~0.7.4", "temp": "~0.7.0", "winston": "~0.7.2", - "request": "~2.34.0", + "request": "~2.36.0", "bplist-parser": "~0.0.4", "plist": "~0.4.3", "bufferpack": "0.0.6", "bplist-creator": "~0.0.2", "node-uuid": "~1.4.1", "underscore.string": "~2.3.3", - "glob": "~3.2.7", + "glob": "~4.0.0", "unzip": "~0.1.9", "ncp": "~0.5.0", "swig": "~1.3.2", - "async": "~0.7.0", - "mkdirp": "~0.3.5", + "async": "~0.9.0", + "mkdirp": "~0.5.0", "xml2js": "~0.4.2", "difflib": "~0.2.4", "prompt": "~0.2.11", @@ -77,7 +77,7 @@ "md5calculator": "~0.0.3", "through": "~2.3.4", "date-utils": "~1.2.14", - "bytes": "~0.2.1", + "bytes": "~1.0.0", "appium-atoms": "~0.0.5", "appium-instruments": "~0.1.21", "appium-uiauto": "~0.0.18", @@ -98,12 +98,12 @@ "grunt-contrib-jshint": "~0.10.0", "grunt-jscs-checker": "~0.4.3", "grunt-mocha-test": "~0.10.0", - "mocha": "~1.18.2", + "mocha": "~1.19.0", "monocle-js": "~0.6.1", "node-static": "~0.7.2", - "q": "~1.0.0", + "q": "~2.0.1", "saucelabs": "~0.1.1", - "sinon": "~1.9.0", + "sinon": "~1.10.0", "sinon-chai": "~2.5.0", "socket.io-client": "~0.9.16", "socks": "~0.0.1", diff --git a/test/functional/common/webview/implicit-wait-base.js b/test/functional/common/webview/implicit-wait-base.js index 97b3a795075..0d252b095fb 100644 --- a/test/functional/common/webview/implicit-wait-base.js +++ b/test/functional/common/webview/implicit-wait-base.js @@ -22,7 +22,7 @@ module.exports = function (desired) { //((after - before) < 9).should.be.ok; ((after - before) > 7).should.be.ok; }); - }).fin(function () { + }).finally(function () { return driver.setImplicitWaitTimeout(0); }).nodeify(done); });