fix async coverage tests

Author: fyockm

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(test) {
-	_require(test, 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

@@ -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) {

test/fixtures/coverage-code.js

@@ -4,6 +4,10 @@ exports.myMethod = function() {
 
 exports.myAsyncMethod = function(callback) {
     setTimeout(function() {
-	callback(123);
+	       callback(123);
     }, 10000);
-};
+};
+
+exports.myOtherMethod = function(callback) {
+    return 321
+};

test/fixtures/coverage-test.js

@@ -9,7 +9,7 @@ test('myAsyncMethod test', function() {
     expect(2);
 
     myAsyncMethod(function(data) {
-	equal(data, 123, 'myAsyncMethod returns right result');
-	start();
+        equal(data, 123, 'myAsyncMethod returns right result');
+        start();
     });
 });

test/testrunner.js

@@ -155,26 +155,26 @@ chain.add('uncaught exception', function() {
 chain.add('coverage', function() {
     tr.options.coverage = true;
     tr.run({
-	code: fixtures + '/coverage-code.js',
-	tests: fixtures + '/coverage-test.js'
+        code: fixtures + '/coverage-code.js',
+        tests: fixtures + '/coverage-test.js'
     }, function(err, res) {
-	var stat = {
+        var stat = {
             files: 1,
-	    tests: 2,
-	    assertions: 3,
-	    failed: 0,
-	    passed: 3,
-	    coverage: {
-		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;
+        delete res.runtime;
         a.equal(err, null, 'no errors');
-	a.deepEqual(stat, res, 'coverage code testing works');
+        a.deepEqual(stat, res, 'coverage code testing works');
         chain.next();
     });
 });