Skip to content

Commit bb38afd

Browse files
committed
Update: Switch to mocha + expect for testing
1 parent b34aa5a commit bb38afd

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.travis.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
sudo: false
2-
32
language: node_js
4-
53
node_js:
6-
- '0.10'
4+
- '6'
5+
- '5'
6+
- '4'
77
- '0.12'
8-
- 'stable'
9-
10-
script:
11-
- npm test
12-
- npm run lint
8+
- '0.10'
9+
after_script:
10+
- npm run coveralls

package.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,24 @@
1313
},
1414
"main": "index.js",
1515
"scripts": {
16-
"test": "lab -cv",
17-
"lint": "eslint . && jscs *.js test/"
16+
"lint": "eslint . && jscs index.js test/",
17+
"pretest": "npm run lint",
18+
"test": "mocha --async-only",
19+
"cover": "istanbul cover _mocha --report lcovonly",
20+
"coveralls": "npm run cover && istanbul-coveralls"
1821
},
1922
"dependencies": {
2023
"async-done": "^1.1.1"
2124
},
2225
"devDependencies": {
23-
"code": "^1.5.0",
2426
"eslint": "^1.7.3",
2527
"eslint-config-gulp": "^2.0.0",
28+
"expect": "^1.19.0",
29+
"istanbul": "^0.4.3",
30+
"istanbul-coveralls": "^1.0.3",
2631
"jscs": "^2.3.5",
2732
"jscs-preset-gulp": "^1.0.0",
28-
"lab": "^6.2.0"
33+
"mocha": "^2.4.5"
2934
},
3035
"keywords": [
3136
"settle",

test/index.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
'use strict';
22

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

85
var settle = require('../');
96

@@ -14,7 +11,7 @@ describe('asyncSettle', function() {
1411
settle(function(done) {
1512
done(null, val);
1613
}, function(err, result) {
17-
expect(result).to.include({
14+
expect(result).toInclude({
1815
state: 'success',
1916
value: val,
2017
});
@@ -27,7 +24,7 @@ describe('asyncSettle', function() {
2724
settle(function(done) {
2825
done(error);
2926
}, function(err, result) {
30-
expect(result).to.include({
27+
expect(result).toInclude({
3128
state: 'error',
3229
value: error,
3330
});

0 commit comments

Comments
 (0)