Skip to content

Commit

Permalink
Upgrade: Update async-done, async-settle, lodash & dev dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
erikkemperman authored and phated committed Jun 27, 2016
1 parent 861710b commit df1b36e
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 22 deletions.
13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,16 @@
"lint": "jshint test lib index.js --reporter node_modules/jshint-stylish/stylish.js --exclude node_modules"
},
"dependencies": {
"async-done": "^1.0.0",
"async-settle": "^0.2.0",
"lodash": "^3.0.0",
"async-done": "^1.1.1",
"async-settle": "^0.2.1",
"lodash": "^3.10.1",
"now-and-later": "0.0.6"
},
"devDependencies": {
"jshint": "^2.5.5",
"jshint-stylish": "^0.4.0",
"lab": "^4.1.0"
"code": "^1.5.0",
"jshint": "^2.8.0",
"jshint-stylish": "^2.0.1",
"lab": "^6.2.0"
},
"keywords": [
"compose",
Expand Down
2 changes: 1 addition & 1 deletion test/getExtensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var before = lab.before;
var beforeEach = lab.beforeEach;
var after = lab.after;
var afterEach = lab.afterEach;
var expect = require('lab').expect;
var expect = require('code').expect;

var getExtensions = require('../lib/helpers').getExtensions;

Expand Down
2 changes: 1 addition & 1 deletion test/onSettled.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var before = lab.before;
var beforeEach = lab.beforeEach;
var after = lab.after;
var afterEach = lab.afterEach;
var expect = require('lab').expect;
var expect = require('code').expect;

var onSettled = require('../lib/helpers').onSettled;

Expand Down
4 changes: 2 additions & 2 deletions test/parallel.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var before = lab.before;
var beforeEach = lab.beforeEach;
var after = lab.after;
var afterEach = lab.afterEach;
var expect = require('lab').expect;
var expect = require('code').expect;

var bach = require('../');

Expand Down Expand Up @@ -70,7 +70,7 @@ describe('parallel', function(){
}
})(function(error, results){
expect(error).to.equal(null);
expect(arr).to.deep.include.members(fns);
expect(arr).to.deep.include(fns);
});
done();
});
Expand Down
4 changes: 2 additions & 2 deletions test/series.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var before = lab.before;
var beforeEach = lab.beforeEach;
var after = lab.after;
var afterEach = lab.afterEach;
var expect = require('lab').expect;
var expect = require('code').expect;

var bach = require('../');

Expand Down Expand Up @@ -69,7 +69,7 @@ describe('series', function(){
}
})(function(error, results){
expect(error).to.equal(null);
expect(arr).to.deep.include.members(fns);
expect(arr).to.deep.include(fns);
});
done();
});
Expand Down
11 changes: 6 additions & 5 deletions test/settleParallel.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var before = lab.before;
var beforeEach = lab.beforeEach;
var after = lab.after;
var afterEach = lab.afterEach;
var expect = require('lab').expect;
var expect = require('code').expect;

var bach = require('../');

Expand Down Expand Up @@ -47,9 +47,10 @@ describe('settleParallel', function(){
}
bach.settleParallel(fn1, slowFn, fn3, fnError)(function(errors, results){
expect(errors)
.to.be.an('array')
.and.to.have.property('0')
.that.is.an.instanceof(Error);
.to.be.an.array()
.and.to.not.be.empty();
expect(errors[0])
.to.be.an.instanceof(Error);
expect(results).to.deep.equal([1, 2, 3]);
done();
});
Expand All @@ -72,7 +73,7 @@ describe('settleParallel', function(){
}
})(function(error, results){
expect(error).to.equal(null);
expect(arr).to.deep.include.members(fns);
expect(arr).to.deep.include(fns);
});
done();
});
Expand Down
9 changes: 5 additions & 4 deletions test/settleSeries.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var before = lab.before;
var beforeEach = lab.beforeEach;
var after = lab.after;
var afterEach = lab.afterEach;
var expect = require('lab').expect;
var expect = require('code').expect;

var bach = require('../');

Expand Down Expand Up @@ -47,9 +47,10 @@ describe('settleSeries', function(){
}
bach.settleSeries(fn1, slowFn, fn3, fnError)(function(errors, results){
expect(errors)
.to.be.an('array')
.and.to.have.property('0')
.that.is.an.instanceof(Error);
.to.be.an.array()
.and.to.not.be.empty();
expect(errors[0])
.to.be.an.instanceof(Error);
expect(results).to.deep.equal([1, 2, 3]);
done();
});
Expand Down
2 changes: 1 addition & 1 deletion test/verifyArguments.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ var before = lab.before;
var beforeEach = lab.beforeEach;
var after = lab.after;
var afterEach = lab.afterEach;
var expect = require('lab').expect;
var expect = require('code').expect;

var verifyArguments = require('../lib/helpers').verifyArguments;

Expand Down

0 comments on commit df1b36e

Please sign in to comment.