Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .jscsrc
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
],
"disallowMultipleVarDecl": "exceptUndefined",
"disallowSpacesInsideObjectBrackets": null,
"jsDoc": false,
"requireDotNotation": false,
"maximumLineLength": {
"value": 150,
"allowComments": true,
Expand Down
3 changes: 1 addition & 2 deletions common/models/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
}
);
Expand Down
2 changes: 1 addition & 1 deletion lib/persisted-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
Expand Down
50 changes: 26 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions test/access-token.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
29 changes: 18 additions & 11 deletions test/app.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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();
});
Expand Down Expand Up @@ -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') {
Expand All @@ -1061,6 +1068,6 @@ function executeMiddlewareHandlers(app, urlPath, callback) {
request(server)
.get(urlPath)
.end(function(err) {
if (err) return callback(err);
callback(handlerError || err);
});
}
7 changes: 4 additions & 3 deletions test/error-handler.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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();
});
Expand All @@ -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();
});
Expand Down
18 changes: 9 additions & 9 deletions test/hidden-properties.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/relations.integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand All @@ -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);

Expand Down
3 changes: 0 additions & 3 deletions test/rest.middleware.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ describe('loopback.rest', function() {
MyModel.attachTo(db);
});

if (process.env.CI)
this.timeout(3000);

it('works out-of-the-box', function(done) {
app.model(MyModel);
app.use(loopback.rest());
Expand Down
Loading