Update: Switch to mocha + expect for testing

Author: phated

.travis.yml

@@ -1,8 +1,10 @@
 sudo: false
-
 language: node_js
-
 node_js:
-  - '0.10'
+  - '6'
+  - '5'
+  - '4'
   - '0.12'
-  - 'stable'
+  - '0.10'
+after_script:
+  - npm run coveralls

package.json

@@ -19,8 +19,11 @@
     "LICENSE"
   ],
   "scripts": {
-    "lint": "eslint . && jscs *.js test/",
-    "test": "lab -cv"
+    "lint": "eslint . && jscs index.js test/",
+    "pretest": "npm run lint",
+    "test": "mocha --async-only",
+    "cover": "istanbul cover _mocha --report lcovonly",
+    "coveralls": "npm run cover && istanbul-coveralls"
   },
   "dependencies": {
     "end-of-stream": "^1.1.0",
@@ -29,12 +32,14 @@
     "stream-exhaust": "^1.0.1"
   },
   "devDependencies": {
-    "code": "^1.4.1",
     "eslint": "^1.7.3",
     "eslint-config-gulp": "^2.0.0",
+    "expect": "^1.19.0",
+    "istanbul": "^0.4.3",
+    "istanbul-coveralls": "^1.0.3",
     "jscs": "^2.3.5",
     "jscs-preset-gulp": "^1.0.0",
-    "lab": "^6.2.0",
+    "mocha": "^2.4.5",
     "rx": "^4.0.6",
     "through2": "^2.0.0",
     "when": "^3.7.3"

test/arguments.js

@@ -1,9 +1,6 @@
 'use strict';
 
-var lab = exports.lab = require('lab').script();
-var describe = lab.describe;
-var it = lab.it;
-var expect = require('code').expect;
+var expect = require('expect');
 
 var asyncDone = require('../');
 
@@ -15,8 +12,8 @@ describe('arguments', function() {
 
   it('passes all arguments to the completion callback', function(done) {
     asyncDone(twoArg, function(err, arg1, arg2) {
-      expect(arg1).to.equal(1);
-      expect(arg2).to.equal(2);
+      expect(arg1).toEqual(1);
+      expect(arg2).toEqual(2);
       done(err);
     });
   });

test/callbacks.js

@@ -1,9 +1,6 @@
 'use strict';
 
-var lab = exports.lab = require('lab').script();
-var describe = lab.describe;
-var it = lab.it;
-var expect = require('code').expect;
+var expect = require('expect');
 
 var asyncDone = require('../');
 
@@ -23,14 +20,14 @@ describe('callbacks', function() {
 
   it('should handle a successful callback', function(done) {
     asyncDone(success, function(err, result) {
-      expect(result).to.equal(2);
+      expect(result).toEqual(2);
       done(err);
     });
   });
 
   it('should handle an errored callback', function(done) {
     asyncDone(failure, function(err) {
-      expect(err).to.be.instanceof(Error);
+      expect(err).toBeAn(Error);
       done();
     });
   });
@@ -48,7 +45,7 @@ describe('callbacks', function() {
   it('should not handle error if something throws inside the callback', function(done) {
     var d = require('domain').create();
     d.on('error', function(err) {
-      expect(err).to.be.instanceof(Error);
+      expect(err).toBeAn(Error);
       done();
     });
 

test/child_processes.js

@@ -1,9 +1,6 @@
 'use strict';
 
-var lab = exports.lab = require('lab').script();
-var describe = lab.describe;
-var it = lab.it;
-var expect = require('code').expect;
+var expect = require('expect');
 
 var cp = require('child_process');
 var asyncDone = require('../');
@@ -28,28 +25,28 @@ function spawnFail() {
 describe('child processes', function() {
   it('should handle successful exec', function(done) {
     asyncDone(execSuccess, function(err) {
-      expect(err).to.not.be.instanceof(Error);
+      expect(err).toNotBeAn(Error);
       done();
     });
   });
 
   it('should handle failing exec', function(done) {
     asyncDone(execFail, function(err) {
-      expect(err).to.be.an.instanceof(Error);
+      expect(err).toBeAn(Error);
       done();
     });
   });
 
   it('should handle successful spawn', function(done) {
     asyncDone(spawnSuccess, function(err) {
-      expect(err).to.not.be.instanceof(Error);
+      expect(err).toNotBeAn(Error);
       done();
     });
   });
 
   it('should handle failing spawn', function(done) {
     asyncDone(spawnFail, function(err) {
-      expect(err).to.be.an.instanceof(Error);
+      expect(err).toBeAn(Error);
       done();
     });
   });

test/observables.js

@@ -1,9 +1,6 @@
 'use strict';
 
-var lab = exports.lab = require('lab').script();
-var describe = lab.describe;
-var it = lab.it;
-var expect = require('code').expect;
+var expect = require('expect');
 
 var asyncDone = require('../');
 
@@ -25,21 +22,21 @@ describe('observables', function() {
 
   it('should handle a finished observable', function(done) {
     asyncDone(success, function(err, result) {
-      expect(result).to.equal(undefined);
+      expect(result).toEqual(undefined);
       done(err);
     });
   });
 
   it('should handle a finished observable with value', function(done) {
     asyncDone(successValue, function(err, result) {
-      expect(result).to.equal(42);
+      expect(result).toEqual(42);
       done(err);
     });
   });
 
   it('should handle an errored observable', function(done) {
     asyncDone(failure, function(err) {
-      expect(err).to.be.instanceof(Error);
+      expect(err).toBeAn(Error);
       done();
     });
   });

test/promises.js

@@ -1,9 +1,6 @@
 'use strict';
 
-var lab = exports.lab = require('lab').script();
-var describe = lab.describe;
-var it = lab.it;
-var expect = require('code').expect;
+var expect = require('expect');
 
 var when = require('when');
 
@@ -21,14 +18,14 @@ describe('promises', function() {
 
   it('should handle a resolved promise', function(done) {
     asyncDone(success, function(err, result) {
-      expect(result).to.equal(2);
+      expect(result).toEqual(2);
       done(err);
     });
   });
 
   it('should handle a rejected promise', function(done) {
     asyncDone(failure, function(err) {
-      expect(err).to.be.instanceof(Error);
+      expect(err).toBeAn(Error);
       done();
     });
   });

test/streams.js

@@ -1,12 +1,8 @@
 'use strict';
 
-var lab = exports.lab = require('lab').script();
-var describe = lab.describe;
-var it = lab.it;
-var expect = require('code').expect;
+var expect = require('expect');
 
 var fs = require('fs');
-var cp = require('child_process');
 var path = require('path');
 var through = require('through2');
 
@@ -40,14 +36,14 @@ function unpiped() {
 describe('streams', function() {
   it('should handle a successful stream', function(done) {
     asyncDone(success, function(err) {
-      expect(err).to.not.be.instanceof(Error);
+      expect(err).toNotBeAn(Error);
       done();
     });
   });
 
   it('should handle an errored stream', function(done) {
     asyncDone(failure, function(err) {
-      expect(err).to.be.instanceof(Error);
+      expect(err).toBeAn(Error);
       done();
     });
   });
@@ -58,15 +54,15 @@ describe('streams', function() {
         cb(null, 3);
       });
     }, function(err, result) {
-      expect(err).to.not.be.instanceof(Error);
-      expect(result).to.equal(3); // To know we called the callback
+      expect(err).toNotBeAn(Error);
+      expect(result).toEqual(3); // To know we called the callback
       done();
     });
   });
 
   it('consumes an unpiped readable stream', function(done) {
     asyncDone(unpiped, function(err) {
-      expect(err).to.not.be.instanceof(Error);
+      expect(err).toNotBeAn(Error);
       done();
     });
   });