From fea3b781a091ac3bd07479a19c490914b0bb7a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= <mbajtos@cz.ibm.com>
Date: Tue, 2 Aug 2016 10:59:21 +0200
Subject: [PATCH] Update dependencies to their latest versions

---
 .jscsrc                        |  2 ++
 common/models/user.js          |  3 +-
 lib/persisted-model.js         |  2 +-
 package.json                   | 50 ++++++++++++++++++----------------
 test/access-token.test.js      |  4 +--
 test/error-handler.test.js     |  7 +++--
 test/hidden-properties.test.js | 18 ++++++------
 test/karma.conf.js             |  6 ++--
 test/relations.integration.js  |  6 ++--
 test/user.test.js              |  6 ++--
 10 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/.jscsrc b/.jscsrc
index ba97a76d..b2569dc0 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -10,6 +10,8 @@
   ],
   "disallowMultipleVarDecl": "exceptUndefined",
   "disallowSpacesInsideObjectBrackets": null,
+  "jsDoc": false,
+  "requireDotNotation": false,
   "maximumLineLength": {
      "value": 150,
      "allowComments": true,
diff --git a/common/models/user.js b/common/models/user.js
index 1a5e6e8c..4d9292a2 100644
--- a/common/models/user.js
+++ b/common/models/user.js
@@ -672,8 +672,7 @@ module.exports = function(User) {
             return tokenID;
           }, description: 'Do not supply this argument, it is automatically extracted ' +
             'from request headers.'
-          }
-        ],
+        }],
         http: {verb: 'all'}
       }
     );
diff --git a/lib/persisted-model.js b/lib/persisted-model.js
index 73499279..a7b8315d 100644
--- a/lib/persisted-model.js
+++ b/lib/persisted-model.js
@@ -702,7 +702,7 @@ module.exports = function(registry) {
         accepts: [
           {arg: 'since', type: 'number', description: 'Find deltas since this checkpoint'},
           {arg: 'remoteChanges', type: 'array', description: 'an array of change objects',
-           http: {source: 'body'}}
+            http: {source: 'body'}}
         ],
         returns: {arg: 'result', type: 'object', root: true},
         http: {verb: 'post', path: '/diff'}
diff --git a/package.json b/package.json
index f65d4498..bef100d6 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "test": "grunt mocha-and-karma"
   },
   "dependencies": {
-    "async": "^0.9.0",
+    "async": "^2.0.1",
     "bcryptjs": "^2.1.0",
     "body-parser": "^1.12.0",
     "canonical-json": "0.0.4",
@@ -46,8 +46,8 @@
     "inflection": "^1.6.0",
     "loopback-connector-remote": "^1.0.3",
     "loopback-phase": "^1.2.0",
-    "nodemailer": "^1.3.1",
-    "nodemailer-stub-transport": "^0.1.5",
+    "nodemailer": "^2.5.0",
+    "nodemailer-stub-transport": "^1.0.0",
     "serve-favicon": "^2.2.0",
     "stable": "^0.1.5",
     "strong-remoting": "^2.21.0",
@@ -58,37 +58,39 @@
     "loopback-datasource-juggler": "^2.19.0"
   },
   "devDependencies": {
-    "bluebird": "^2.9.9",
-    "browserify": "^10.0.0",
-    "chai": "^2.1.1",
+    "bluebird": "^3.4.1",
+    "browserify": "^13.1.0",
+    "chai": "^3.5.0",
     "es5-shim": "^4.1.0",
-    "grunt": "^0.4.5",
-    "grunt-browserify": "^3.5.0",
-    "grunt-cli": "^0.1.13",
-    "grunt-contrib-jshint": "^0.11.0",
-    "grunt-contrib-uglify": "^0.9.1",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-jscs": "^1.5.0",
-    "grunt-karma": "^0.10.1",
+    "eslint-config-loopback": "^1.0.0",
+    "grunt": "^1.0.1",
+    "grunt-browserify": "^5.0.0",
+    "grunt-cli": "^1.2.0",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-uglify": "^2.0.0",
+    "grunt-contrib-watch": "^1.0.0",
+    "grunt-jscs": "^3.0.1",
+    "grunt-karma": "^2.0.0",
     "grunt-mocha-test": "^0.12.7",
-    "karma": "^0.12.31",
-    "karma-browserify": "^4.0.0",
-    "karma-chrome-launcher": "^0.1.7",
-    "karma-firefox-launcher": "^0.1.4",
-    "karma-html2js-preprocessor": "^0.1.0",
-    "karma-junit-reporter": "^0.2.2",
-    "karma-mocha": "^0.1.10",
+    "karma": "^1.1.2",
+    "karma-browserify": "^4.4.2",
+    "karma-chrome-launcher": "^1.0.1",
+    "karma-firefox-launcher": "^1.0.0",
+    "karma-html2js-preprocessor": "^1.0.0",
+    "karma-junit-reporter": "^1.0.0",
+    "karma-mocha": "^1.1.1",
     "karma-phantomjs-launcher": "^1.0.0",
-    "karma-script-launcher": "^0.1.0",
+    "karma-script-launcher": "^1.0.0",
     "loopback-boot": "^2.7.0",
     "loopback-datasource-juggler": "^2.19.1",
     "loopback-testing": "~1.1.0",
-    "mocha": "^2.1.0",
+    "mocha": "^3.0.0",
     "phantomjs-prebuilt": "^2.1.7",
     "sinon": "^1.13.0",
     "sinon-chai": "^2.8.0",
+    "strong-error-handler": "^1.0.1",
     "strong-task-emitter": "^0.0.6",
-    "supertest": "^0.15.0"
+    "supertest": "^2.0.0"
   },
   "repository": {
     "type": "git",
diff --git a/test/access-token.test.js b/test/access-token.test.js
index c0b9a436..690b1953 100644
--- a/test/access-token.test.js
+++ b/test/access-token.test.js
@@ -421,7 +421,7 @@ describe('app.enableAuth()', function() {
   });
 
   it('prevent remote call with app setting status on denied ACL', function(done) {
-    createTestAppAndRequest(this.token, {app:{aclErrorStatus:403}}, done)
+    createTestAppAndRequest(this.token, {app: {aclErrorStatus: 403}}, done)
       .del('/tests/123')
       .expect(403)
       .set('authorization', this.token.id)
@@ -439,7 +439,7 @@ describe('app.enableAuth()', function() {
   });
 
   it('prevent remote call with app setting status on denied ACL', function(done) {
-    createTestAppAndRequest(this.token, {model:{aclErrorStatus:404}}, done)
+    createTestAppAndRequest(this.token, {model: {aclErrorStatus: 404}}, done)
       .del('/tests/123')
       .expect(404)
       .set('authorization', this.token.id)
diff --git a/test/error-handler.test.js b/test/error-handler.test.js
index 27348124..d522c5e6 100644
--- a/test/error-handler.test.js
+++ b/test/error-handler.test.js
@@ -5,7 +5,7 @@
 
 var loopback = require('../');
 var app;
-var assert = require('assert');
+var expect = require('chai').expect;
 var request = require('supertest');
 
 describe('loopback.errorHandler(options)', function() {
@@ -21,7 +21,8 @@ describe('loopback.errorHandler(options)', function() {
     request(app)
       .get('/url-does-not-exist')
       .end(function(err, res) {
-        assert.ok(res.error.text.match(/<ul id="stacktrace"><li> &nbsp; &nbsp;at raiseUrlNotFoundError/));
+        expect(res.error.text).to.match(
+          /<ul id="stacktrace"><li>( &nbsp;)+at raiseUrlNotFoundError/);
 
         done();
       });
@@ -38,7 +39,7 @@ describe('loopback.errorHandler(options)', function() {
     request(app)
       .get('/url-does-not-exist')
       .end(function(err, res) {
-        assert.ok(res.error.text.match(/<ul id="stacktrace"><\/ul>/));
+        expect(res.error.text).to.match(/<ul id="stacktrace"><\/ul>/);
 
         done();
       });
diff --git a/test/hidden-properties.test.js b/test/hidden-properties.test.js
index 6e3f7206..8059ddf5 100644
--- a/test/hidden-properties.test.js
+++ b/test/hidden-properties.test.js
@@ -41,17 +41,17 @@ describe('hidden properties', function() {
 
   it('should hide a property remotely', function(done) {
     request(this.app)
-       .get('/products')
-       .expect('Content-Type', /json/)
-       .expect(200)
-       .end(function(err, res) {
-         if (err) return done(err);
+      .get('/products')
+      .expect('Content-Type', /json/)
+      .expect(200)
+      .end(function(err, res) {
+        if (err) return done(err);
 
-         var product = res.body[0];
-         assert.equal(product.secret, undefined);
+        var product = res.body[0];
+        assert.equal(product.secret, undefined);
 
-         done();
-       });
+        done();
+      });
   });
 
   it('should hide a property of nested models', function(done) {
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 96a4d4e6..9c111025 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -73,9 +73,9 @@ module.exports = function(config) {
     captureTimeout: 60000,
 
     // to avoid DISCONNECTED messages
-    browserDisconnectTimeout : 10000, // default 2000
-    browserDisconnectTolerance : 1, // default 0
-    browserNoActivityTimeout : 60000, //default 10000
+    browserDisconnectTimeout: 10000, // default 2000
+    browserDisconnectTolerance: 1, // default 0
+    browserNoActivityTimeout: 60000, //default 10000
 
     // Continuous Integration mode
     // if true, it capture browsers, run tests and exit
diff --git a/test/relations.integration.js b/test/relations.integration.js
index e853513e..ba4ea15e 100644
--- a/test/relations.integration.js
+++ b/test/relations.integration.js
@@ -102,7 +102,7 @@ describe('relations - integration', function() {
     it('includes the related child model', function(done) {
       var url = '/api/readers/' + this.reader.id;
       this.get(url)
-        .query({'filter': {'include' : 'pictures'}})
+        .query({'filter': {'include': 'pictures'}})
         .expect(200, function(err, res) {
           if (err) return done(err);
 
@@ -119,7 +119,7 @@ describe('relations - integration', function() {
     it('includes the related parent model', function(done) {
       var url = '/api/pictures';
       this.get(url)
-        .query({'filter': {'include' : 'imageable'}})
+        .query({'filter': {'include': 'imageable'}})
         .expect(200, function(err, res) {
           if (err) return done(err);
 
@@ -134,7 +134,7 @@ describe('relations - integration', function() {
     it('includes related models scoped to the related parent model', function(done) {
       var url = '/api/pictures';
       this.get(url)
-        .query({'filter': {'include' : {'relation': 'imageable', 'scope': { 'include' : 'team'}}}})
+        .query({'filter': {'include': {'relation': 'imageable', 'scope': { 'include': 'team'}}}})
         .expect(200, function(err, res) {
           if (err) return done(err);
 
diff --git a/test/user.test.js b/test/user.test.js
index 3fc2ccda..cfb7232e 100644
--- a/test/user.test.js
+++ b/test/user.test.js
@@ -388,7 +388,7 @@ describe('User', function() {
 
     it('Should be able to find lowercase email with mixed-case email query', function(done) {
       User.settings.caseSensitiveEmail = false;
-      User.find({where:{email: validMixedCaseEmailCredentials.email}}, function(err, result) {
+      User.find({where: {email: validMixedCaseEmailCredentials.email}}, function(err, result) {
         if (err) done(err);
 
         assert(result[0], 'The query did not find the user');
@@ -1225,7 +1225,7 @@ describe('User', function() {
             redirect: '/',
             protocol: ctx.req.protocol,
             host: ctx.req.get('host'),
-            headers: {'message-id':'custom-header-value'}
+            headers: {'message-id': 'custom-header-value'}
           };
 
           user.verify(options, function(err, result) {
@@ -1680,7 +1680,7 @@ describe('User', function() {
           .end(function(err, res) {
             if (err) return done(err);
 
-            assert.deepEqual(res.body, { });
+            assert.deepEqual(res.body, '');
 
             done();
           });