Skip to content

Commit e3901ed

Browse files
phatedphated
committed
Update: Switch to mocha + expect for testing
1 parent 67fd02c commit e3901ed

9 files changed

+107
-137
lines changed

‎.travis.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
sudo: false
22
language: node_js
33
node_js:
4-
- 'stable'
4+
- '6'
5+
- '5'
56
- '4'
67
- '0.12'
78
- '0.10'
9+
after_script:
10+
- npm run coveralls

‎package.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
"lib"
1919
],
2020
"scripts": {
21-
"lint": "eslint . && jscs *.js lib/ test/",
22-
"test": "lab -cv --ignore store@sparkles"
21+
"lint": "eslint . && jscs index.js test/",
22+
"test": "mocha --async-only",
23+
"cover": "istanbul cover _mocha --report lcovonly",
24+
"coveralls": "npm run cover && istanbul-coveralls"
2325
},
2426
"dependencies": {
2527
"bach": "^0.5.0",
@@ -33,14 +35,16 @@
3335
},
3436
"devDependencies": {
3537
"async-once": "^1.0.0",
36-
"code": "^1.2.1",
3738
"del": "^2.0.2",
3839
"eslint": "^1.7.3",
3940
"eslint-config-gulp": "^2.0.0",
41+
"expect": "^1.19.0",
4042
"gulp-jshint": "^1.8.4",
43+
"istanbul": "^0.4.3",
44+
"istanbul-coveralls": "^1.0.3",
4145
"jscs": "^2.3.5",
4246
"jscs-preset-gulp": "^1.0.0",
43-
"lab": "^6.2.0",
47+
"mocha": "^2.4.5",
4448
"once": "^1.3.1",
4549
"through2": "^2.0.0",
4650
"undertaker-common-tasks": "^1.0.0",

‎test/integration.js

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
'use strict';
22

3-
var lab = exports.lab = require('lab').script();
4-
var expect = require('code').expect;
5-
6-
var describe = lab.describe;
7-
var it = lab.it;
8-
var beforeEach = lab.beforeEach;
3+
var expect = require('expect');
94

105
var fs = require('fs');
116
var path = require('path');
@@ -82,7 +77,7 @@ describe('integrations', function() {
8277
));
8378

8479
taker.parallel('build')(function(err) {
85-
expect(count).to.equal(1);
80+
expect(count).toEqual(1);
8681
done(err);
8782
});
8883
});
@@ -108,7 +103,7 @@ describe('integrations', function() {
108103
));
109104

110105
taker.parallel('build')(function(err) {
111-
expect(count).to.equal(1);
106+
expect(count).toEqual(1);
112107
done(err);
113108
});
114109
});
@@ -144,7 +139,7 @@ describe('integrations', function() {
144139
}
145140

146141
taker.series(setup, 'build', userWait, userEdit, countEditedFiles, function(cb) {
147-
expect(count).to.be.equal(1);
142+
expect(count).toEqual(1);
148143
cb();
149144
})(done);
150145
});

‎test/last-run.js

+16-24
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
'use strict';
22

3-
var lab = exports.lab = require('lab').script();
4-
var expect = require('code').expect;
5-
6-
var describe = lab.describe;
7-
var it = lab.it;
8-
var beforeEach = lab.beforeEach;
9-
var afterEach = lab.afterEach;
3+
var expect = require('expect');
104

115
var Undertaker = require('../');
126

@@ -57,44 +51,42 @@ describe('lastRun', function() {
5751
};
5852
taker.task('test', test);
5953
taker.parallel('test')(function(err) {
60-
expect(ts).to.be.undefined();
54+
expect(ts).toEqual(undefined);
6155
done(err);
6256
});
6357
});
6458

6559
it('should record tasks time execution', function(done) {
66-
var since = Date.now();
6760
taker.parallel('test1')(function(err) {
68-
expect(taker.lastRun('test1')).to.exist();
69-
expect(taker.lastRun('test1')).to.be.within(since, Date.now());
70-
expect(taker.lastRun(test2)).to.not.exist();
71-
expect(taker.lastRun(function() {})).to.not.exist();
72-
expect(taker.lastRun.bind(taker, 'notexists')).to.throw(Error);
61+
expect(taker.lastRun('test1')).toExist();
62+
expect(taker.lastRun('test1')).toBeLessThanOrEqualTo(Date.now());
63+
expect(taker.lastRun(test2)).toNotExist();
64+
expect(taker.lastRun(function() {})).toNotExist();
65+
expect(taker.lastRun.bind(taker, 'notexists')).toThrow(Error);
7366
done(err);
7467
});
7568
});
7669

7770
it('should record all tasks time execution', function(done) {
78-
var since = Date.now();
7971
taker.parallel('test1', test2)(function(err) {
80-
expect(taker.lastRun('test1')).to.exist();
81-
expect(taker.lastRun('test1')).to.be.within(since, Date.now());
82-
expect(taker.lastRun(test2)).to.exist();
83-
expect(taker.lastRun(test2)).to.be.within(since, Date.now());
72+
expect(taker.lastRun('test1')).toExist();
73+
expect(taker.lastRun('test1')).toBeLessThanOrEqualTo(Date.now());
74+
expect(taker.lastRun(test2)).toExist();
75+
expect(taker.lastRun(test2)).toBeLessThanOrEqualTo(Date.now());
8476
done(err);
8577
});
8678
});
8779

8880
it('should record same tasks time execution for a string task and its original', function(done) {
8981
taker.series(test2)(function(err) {
90-
expect(taker.lastRun(test2)).to.equal(taker.lastRun('test2'));
82+
expect(taker.lastRun(test2)).toEqual(taker.lastRun('test2'));
9183
done(err);
9284
});
9385
});
9486

9587
it('should record tasks time execution for an aliased task', function(done) {
9688
taker.series('alias')(function(err) {
97-
expect(taker.lastRun('alias')).to.equal(taker.lastRun('test1'));
89+
expect(taker.lastRun('alias')).toEqual(taker.lastRun('test1'));
9890
done(err);
9991
});
10092
});
@@ -105,7 +97,7 @@ describe('lastRun', function() {
10597
var expected = since - (since % resolution);
10698

10799
taker.series('test1')(function() {
108-
expect(taker.lastRun('test1', resolution)).to.equal(expected);
100+
expect(taker.lastRun('test1', resolution)).toEqual(expected);
109101
done();
110102
});
111103
});
@@ -115,8 +107,8 @@ describe('lastRun', function() {
115107
// To keep the test from catching the emitted errors
116108
});
117109
taker.series('error')(function(err) {
118-
expect(err).to.exist();
119-
expect(taker.lastRun('error')).to.not.exist();
110+
expect(err).toExist();
111+
expect(taker.lastRun('error')).toNotExist();
120112
done();
121113
});
122114
});

‎test/parallel.js

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
'use strict';
22

3-
var lab = exports.lab = require('lab').script();
4-
var expect = require('code').expect;
5-
6-
var describe = lab.describe;
7-
var it = lab.it;
8-
var beforeEach = lab.beforeEach;
3+
var expect = require('expect');
94

105
var Undertaker = require('../');
116

@@ -41,29 +36,29 @@ describe('parallel', function() {
4136

4237
it('should take all string names', function(done) {
4338
taker.parallel('test1', 'test2', 'test3')(function(err, results) {
44-
expect(results).to.deep.equal([1, 2, 3]);
39+
expect(results).toEqual([1, 2, 3]);
4540
done(err);
4641
});
4742
});
4843

4944
it('should take all functions', function(done) {
5045
taker.parallel(fn1, fn2, fn3)(function(err, results) {
51-
expect(results).to.deep.equal([1, 2, 3]);
46+
expect(results).toEqual([1, 2, 3]);
5247
done(err);
5348
});
5449
});
5550

5651
it('should take string names and functions', function(done) {
5752
taker.parallel('test1', fn2, 'test3')(function(err, results) {
58-
expect(results).to.deep.equal([1, 2, 3]);
53+
expect(results).toEqual([1, 2, 3]);
5954
done(err);
6055
});
6156
});
6257

6358
it('should take nested parallel', function(done) {
6459
var parallel1 = taker.parallel('test1', 'test2', 'test3');
6560
taker.parallel('test1', parallel1, 'test3')(function(err, results) {
66-
expect(results).to.deep.equal([1, [1, 2, 3], 3]);
61+
expect(results).toEqual([1, [1, 2, 3], 3]);
6762
done(err);
6863
});
6964
});
@@ -73,8 +68,8 @@ describe('parallel', function() {
7368
// To keep the test from catching the emitted errors
7469
});
7570
taker.parallel('test1', 'error', 'test3')(function(err, results) {
76-
expect(err).to.be.an.instanceof(Error);
77-
expect(results).to.deep.equal([1, undefined, undefined]);
71+
expect(err).toBeAn(Error);
72+
expect(results).toEqual([1, undefined, undefined]);
7873
done();
7974
});
8075
});
@@ -84,7 +79,7 @@ describe('parallel', function() {
8479
taker.parallel('unregistered');
8580
}
8681

87-
expect(unregistered).to.throw('Task never defined: unregistered');
82+
expect(unregistered).toThrow('Task never defined: unregistered');
8883
done();
8984
});
9085

@@ -94,8 +89,8 @@ describe('parallel', function() {
9489
});
9590
taker._settle = true;
9691
taker.parallel(taker.parallel('test1', 'error'), 'test3')(function(err, results) {
97-
expect(err[0][0]).to.be.an.instanceof(Error);
98-
expect(results).to.deep.equal([3]);
92+
expect(err[0][0]).toBeAn(Error);
93+
expect(results).toEqual([3]);
9994
done();
10095
});
10196
});

0 commit comments

Comments
 (0)