Merge pull request #2671 from sebv/master

Upgraded all packages but express

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);
 

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",

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);
     });