work toward fixing async coverage assertions

Author: fyockm

.jshintrc

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

lib/child.js

@@ -130,8 +130,8 @@ function run() {
     _require(options.code, true);
 
     // require tests
-    options.tests.forEach(function(res) {
-        _require(res, false);
+    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) {
@@ -54,10 +54,10 @@ exports.instrument = function(options, callback) {
         includes: resolvePaths(options.code),
         excludes: resolvePaths(options.tests)
     }, function (err, matcher) {
-        var instrumenter
+	var instrumenter;
 
         if (err) {
-            return callback(err)
+	    return callback(err);
         }
 
         instrumenter = new istanbul.Instrumenter();

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,9 @@
+exports.myMethod = function() {
+    return 123;
+};
+
+exports.myAsyncMethod = function(callback) {
+    setTimeout(function() {
+	callback(123);
+    }, 10000);
+};

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: 4, total: 5 },
+		branches: { covered: 0, total: 0 },
+		functions: { covered: 2, total: 3 },
+		lines: { covered: 4, total: 5 }
+	    }
         };
+	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();
-