diff --git a/.jscsrc b/.jscsrc index ba97a76df..b2569dc0c 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 1a5e6e8c6..4d9292a22 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 734992795..a7b8315d4 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 f65d44985..bef100d67 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 c0b9a4367..690b1953d 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/app.test.js b/test/app.test.js index fd8d03735..fd2abfd89 100644 --- a/test/app.test.js +++ b/test/app.test.js @@ -14,6 +14,7 @@ var loopback = require('../'); var PersistedModel = loopback.PersistedModel; var describe = require('./util/describe'); +var expect = require('chai').expect; var it = require('./util/it'); describe('app', function() { @@ -945,18 +946,14 @@ describe('app', function() { .end(function(err, res) { if (err) return done(err); - assert.equal(typeof res.body, 'object'); - assert(res.body.started); - // The number can be 0 - assert(res.body.uptime !== undefined); + expect(res.body).to.be.an('object'); + expect(res.body).to.have.property('started'); + expect(res.body.uptime, 'uptime').to.be.gte(0); var elapsed = Date.now() - Number(new Date(res.body.started)); - // elapsed should be a positive number... - assert(elapsed >= 0); - - // less than 100 milliseconds - assert(elapsed < 100); + // elapsed should be a small positive number... + expect(elapsed, 'elapsed').to.be.within(0, 300); done(); }); @@ -1049,8 +1046,18 @@ describe('app', function() { }); function executeMiddlewareHandlers(app, urlPath, callback) { + var handlerError; var server = http.createServer(function(req, res) { - app.handle(req, res, callback); + app.handle(req, res, function(err) { + if (err) { + handlerError = err; + res.statusCode = err.status || err.statusCode || 500; + res.end(err.stack || err); + } else { + res.statusCode = 204; + res.end(); + } + }); }); if (callback === undefined && typeof urlPath === 'function') { @@ -1061,6 +1068,6 @@ function executeMiddlewareHandlers(app, urlPath, callback) { request(server) .get(urlPath) .end(function(err) { - if (err) return callback(err); + callback(handlerError || err); }); } diff --git a/test/error-handler.test.js b/test/error-handler.test.js index 273481240..d522c5e6c 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(/