Skip to content

Commit

Permalink
Update dependencies to their latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@bajtos
bajtos committed Aug 5, 2016
1 parent 7f5f8d6 commit fea3b78
Show file tree
Hide file tree
Showing 10 changed files with 54 additions and 50 deletions.
2 changes: 2 additions & 0 deletions .jscsrc
View file
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
View file
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
View file
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
View file
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
View file
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
7 changes: 4 additions & 3 deletions test/error-handler.test.js
View file
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
View file
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
View file
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
View file
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
6 changes: 3 additions & 3 deletions test/user.test.js
View file
Expand Up @@ -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');
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
});
Expand Down

0 comments on commit fea3b78

Please sign in to comment.