Skip to content

Commit df1b36e

Browse files
erikkempermanphated
authored andcommitted
Upgrade: Update async-done, async-settle, lodash & dev dependencies
1 parent 861710b commit df1b36e

File tree

8 files changed

+25
-22
lines changed

8 files changed

+25
-22
lines changed

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,16 @@
2424
"lint": "jshint test lib index.js --reporter node_modules/jshint-stylish/stylish.js --exclude node_modules"
2525
},
2626
"dependencies": {
27-
"async-done": "^1.0.0",
28-
"async-settle": "^0.2.0",
29-
"lodash": "^3.0.0",
27+
"async-done": "^1.1.1",
28+
"async-settle": "^0.2.1",
29+
"lodash": "^3.10.1",
3030
"now-and-later": "0.0.6"
3131
},
3232
"devDependencies": {
33-
"jshint": "^2.5.5",
34-
"jshint-stylish": "^0.4.0",
35-
"lab": "^4.1.0"
33+
"code": "^1.5.0",
34+
"jshint": "^2.8.0",
35+
"jshint-stylish": "^2.0.1",
36+
"lab": "^6.2.0"
3637
},
3738
"keywords": [
3839
"compose",

test/getExtensions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var before = lab.before;
77
var beforeEach = lab.beforeEach;
88
var after = lab.after;
99
var afterEach = lab.afterEach;
10-
var expect = require('lab').expect;
10+
var expect = require('code').expect;
1111

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

test/onSettled.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var before = lab.before;
77
var beforeEach = lab.beforeEach;
88
var after = lab.after;
99
var afterEach = lab.afterEach;
10-
var expect = require('lab').expect;
10+
var expect = require('code').expect;
1111

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

test/parallel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var before = lab.before;
77
var beforeEach = lab.beforeEach;
88
var after = lab.after;
99
var afterEach = lab.afterEach;
10-
var expect = require('lab').expect;
10+
var expect = require('code').expect;
1111

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

@@ -70,7 +70,7 @@ describe('parallel', function(){
7070
}
7171
})(function(error, results){
7272
expect(error).to.equal(null);
73-
expect(arr).to.deep.include.members(fns);
73+
expect(arr).to.deep.include(fns);
7474
});
7575
done();
7676
});

test/series.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var before = lab.before;
77
var beforeEach = lab.beforeEach;
88
var after = lab.after;
99
var afterEach = lab.afterEach;
10-
var expect = require('lab').expect;
10+
var expect = require('code').expect;
1111

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

@@ -69,7 +69,7 @@ describe('series', function(){
6969
}
7070
})(function(error, results){
7171
expect(error).to.equal(null);
72-
expect(arr).to.deep.include.members(fns);
72+
expect(arr).to.deep.include(fns);
7373
});
7474
done();
7575
});

test/settleParallel.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var before = lab.before;
77
var beforeEach = lab.beforeEach;
88
var after = lab.after;
99
var afterEach = lab.afterEach;
10-
var expect = require('lab').expect;
10+
var expect = require('code').expect;
1111

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

@@ -47,9 +47,10 @@ describe('settleParallel', function(){
4747
}
4848
bach.settleParallel(fn1, slowFn, fn3, fnError)(function(errors, results){
4949
expect(errors)
50-
.to.be.an('array')
51-
.and.to.have.property('0')
52-
.that.is.an.instanceof(Error);
50+
.to.be.an.array()
51+
.and.to.not.be.empty();
52+
expect(errors[0])
53+
.to.be.an.instanceof(Error);
5354
expect(results).to.deep.equal([1, 2, 3]);
5455
done();
5556
});
@@ -72,7 +73,7 @@ describe('settleParallel', function(){
7273
}
7374
})(function(error, results){
7475
expect(error).to.equal(null);
75-
expect(arr).to.deep.include.members(fns);
76+
expect(arr).to.deep.include(fns);
7677
});
7778
done();
7879
});

test/settleSeries.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var before = lab.before;
77
var beforeEach = lab.beforeEach;
88
var after = lab.after;
99
var afterEach = lab.afterEach;
10-
var expect = require('lab').expect;
10+
var expect = require('code').expect;
1111

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

@@ -47,9 +47,10 @@ describe('settleSeries', function(){
4747
}
4848
bach.settleSeries(fn1, slowFn, fn3, fnError)(function(errors, results){
4949
expect(errors)
50-
.to.be.an('array')
51-
.and.to.have.property('0')
52-
.that.is.an.instanceof(Error);
50+
.to.be.an.array()
51+
.and.to.not.be.empty();
52+
expect(errors[0])
53+
.to.be.an.instanceof(Error);
5354
expect(results).to.deep.equal([1, 2, 3]);
5455
done();
5556
});

test/verifyArguments.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var before = lab.before;
77
var beforeEach = lab.beforeEach;
88
var after = lab.after;
99
var afterEach = lab.afterEach;
10-
var expect = require('lab').expect;
10+
var expect = require('code').expect;
1111

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

0 commit comments

Comments
 (0)