Merge pull request #91 from fyockm/master

Don't skip async tests when calculating coverage

Author: kof

.jshintrc

@@ -0,0 +1,5 @@
+{
+    "expr": true,
+    "jquery": true,
+    "node": true
+}

.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - '0.8'
+  - '0.10'

lib/child.js

@@ -120,19 +120,19 @@ console.error = function(obj) {
     return error.apply(this, arguments);
 };
 
-function run() {
-    // require deps
-    options.deps.forEach(function(dep) {
-        _require(dep, true);
-    });
+if (options.coverage) {
+    coverage.instrument(options);
+}
 
-    // require code
-    _require(options.code, true);
+// require deps
+options.deps.forEach(function(dep) {
+    _require(dep, true);
+});
 
-    // require tests
-    options.tests.forEach(function(res) {
-        _require(res, false);
-    });
-}
+// require code
+_require(options.code, true);
 
-options.coverage ? coverage.instrument(options, run) : run();
+// require tests
+options.tests.forEach(function(test) {
+    _require(test, false);
+});

lib/coverage.js

@@ -17,7 +17,7 @@ exports.add = function(coverage) {
 };
 
 exports.get = function() {
-    var summaries
+    var summaries;
     if (collector) {
         summaries = [];
         collector.files().forEach(function(file) {
@@ -40,30 +40,14 @@ exports.report = function() {
     }
 };
 
-function resolvePaths(files) {
-    if (Array.isArray(files)) {
-        return files.map(function (file) {
-            return file.path;
-        });
-    }
-    return [files.path];
-}
-
-exports.instrument = function(options, callback) {
-    istanbul.matcherFor({
-        includes: resolvePaths(options.code),
-        excludes: resolvePaths(options.tests)
-    }, function (err, matcher) {
-        var instrumenter
+exports.instrument = function(options) {
+    var matcher, instrumenter;
 
-        if (err) {
-            return callback(err)
-        }
-
-        instrumenter = new istanbul.Instrumenter();
-        istanbul.hook.hookRequire(matcher, instrumenter.instrumentSync.bind(instrumenter));
-        callback();
-    });
+    matcher = function (file) { 
+        return file === options.code.path;
+    }
+    instrumenter = new istanbul.Instrumenter();
+    istanbul.hook.hookRequire(matcher, instrumenter.instrumentSync.bind(instrumenter));
 };
 
 if (!istanbul) {

lib/testrunner.js

@@ -88,7 +88,7 @@ function runOne(opts, callback) {
             callback(null, msg.data);
             kill();
         } else if (msg.event === 'uncaughtException') {
-            callback(_.extend(new Error, msg.data));
+            callback(_.extend(new Error(), msg.data));
             kill();
         }
     });
@@ -150,10 +150,10 @@ exports.run = function(files, callback) {
         files = [files];
     }
 
-    if (options.coverage) coverage.setup();
+    if (options.coverage || files[0].coverage) coverage.setup();
 
     files.forEach(function(file) {
-        var opts =  _.extend({}, options, file);
+        var opts = _.extend({}, options, file);
 
         !opts.log && (opts.log = {});
         opts.deps = absPaths(opts.deps);

package.json

@@ -19,17 +19,17 @@
         "test": "make test"
     },
    "dependencies": {
-       "underscore": "1.3.3",
-       "argsparser": "0.0.6",
-       "cli-table": "0.0.2",
-       "tracejs": "0.1.4"
+	"underscore": "1.3.3",
+	"argsparser": "0.0.6",
+	"cli-table": "0.0.2",
+	"tracejs": "0.1.4"
     },
     "devDependencies": {
         "chainer": "0.0.5",
         "timekeeper": "0.0.2"
     },
     "optionalDependencies": {
-      "istanbul": "0.2.4"
+	"istanbul": "0.2.4"
     },
     "licenses": [
         {

test/fixtures/coverage-code.js

@@ -0,0 +1,13 @@
+exports.myMethod = function() {
+    return 123;
+};
+
+exports.myAsyncMethod = function(callback) {
+    setTimeout(function() {
+	       callback(123);
+    }, 10000);
+};
+
+exports.myOtherMethod = function(callback) {
+    return 321
+};

test/fixtures/coverage-test.js

@@ -0,0 +1,15 @@
+test('myMethod test', function() {
+    equal(myMethod(), 123, 'myMethod returns right result');
+});
+
+test('myAsyncMethod test', function() {
+    ok(true, 'myAsyncMethod started');
+
+    stop();
+    expect(2);
+
+    myAsyncMethod(function(data) {
+        equal(data, 123, 'myAsyncMethod returns right result');
+        start();
+    });
+});

test/testrunner.js

@@ -155,18 +155,26 @@ chain.add('uncaught exception', function() {
 chain.add('coverage', function() {
     tr.options.coverage = true;
     tr.run({
-        code: fixtures + '/testrunner-code.js',
-        tests: fixtures + '/testrunner-tests.js',
+        code: fixtures + '/coverage-code.js',
+        tests: fixtures + '/coverage-test.js'
     }, function(err, res) {
-        var coverage = {
+        var stat = {
             files: 1,
-            statements: { covered: 4, total: 5 },
-            branches: { covered: 0, total: 0 },
-            functions: { covered: 2, total: 3 },
-            lines: { covered: 4, total: 5 }
+            tests: 2,
+            assertions: 3,
+            failed: 0,
+            passed: 3,
+            coverage: {
+                files: 1,
+                statements: { covered: 6, total: 7 },
+                branches: { covered: 0, total: 0 },
+                functions: { covered: 3, total: 4 },
+                lines: { covered: 6, total: 7 }
+            }
         };
+        delete res.runtime;
         a.equal(err, null, 'no errors');
-        a.deepEqual(coverage, res.coverage, 'Coverage calculated');
+        a.deepEqual(stat, res, 'coverage code testing works');
         chain.next();
     });
 });
@@ -176,4 +184,3 @@ chain.add(function() {
 });
 
 chain.start();
-