nested test nearly works

Author: James Halliday

index.js

@@ -37,9 +37,7 @@ function createHarness (conf_) {
         })(t);
 
         results.push(t);
-        nextTick(function () {
-            t.run();
-        });
+        nextTick(function () { t.run() });
         return t;
     };
     test.stream = results;

lib/results.js

@@ -30,16 +30,27 @@ function Results (stream) {
     this.fail = 0;
     this.pass = 0;
     this.stream = stream;
-    this.pending = 0;
+    this.tests = [];
 }
 
 Results.prototype.push = function (t) {
     var self = this;
     var write = function (s) { self.stream.queue(s) };
-    write('# ' + t.name + '\n');
-    self.pending ++;
+    t.on('run', function () {
+        write('# ' + t.name + '\n');
+    });
+    
+    var plan;
+    t.on('plan', function (n) { plan = n });
 
+    var subtests = 0;
     t.on('test', function (st) {
+        subtests ++;
+        st.on('end', function () {
+            nextTick(function () {
+                if (--subtests === 0 && !plan) t.emit('end');
+            });
+        });
         self.push(st);
     });
 
@@ -57,7 +68,9 @@ Results.prototype.push = function (t) {
 
     t.on('end', function () {
         nextTick(function () {
-            if (--self.pending === 0) self.close();
+            if (subtests === 0) return;
+            if (self.tests.length === 0) self.close();
+            else self.tests.shift().run();
         });
     });
 };
@@ -84,49 +97,47 @@ function encodeResult (res, count) {
     else if (res.todo) output += ' # TODO';
 
     output += '\n';
+    if (res.ok) return output;
 
-    if (!res.ok) {
-        var outer = '  ';
-        var inner = outer + '  ';
-        output += outer + '---\n';
-        output += inner + 'operator: ' + res.operator + '\n';
-        
-        var ex = json.stringify(res.expected, getSerialize()) || '';
-        var ac = json.stringify(res.actual, getSerialize()) || '';
-        
-        if (Math.max(ex.length, ac.length) > 65) {
-            output += inner + 'expected:\n' + inner + '  ' + ex + '\n';
-            output += inner + 'actual:\n' + inner + '  ' + ac + '\n';
-        }
-        else {
-            output += inner + 'expected: ' + ex + '\n';
-            output += inner + 'actual:   ' + ac + '\n';
-        }
-        if (res.at) {
-            output += inner + 'at: ' + res.at + '\n';
-        }
-        if (res.operator === 'error' && res.actual && res.actual.stack) {
-            var lines = String(res.actual.stack).split('\n');
-            output += inner + 'stack:\n';
-            output += inner + '  ' + lines[0] + '\n';
-            for (var i = 1; i < lines.length; i++) {
-                output += inner + lines[i] + '\n';
-            }
+    var outer = '  ';
+    var inner = outer + '  ';
+    output += outer + '---\n';
+    output += inner + 'operator: ' + res.operator + '\n';
+    
+    var ex = json.stringify(res.expected, getSerialize()) || '';
+    var ac = json.stringify(res.actual, getSerialize()) || '';
+    
+    if (Math.max(ex.length, ac.length) > 65) {
+        output += inner + 'expected:\n' + inner + '  ' + ex + '\n';
+        output += inner + 'actual:\n' + inner + '  ' + ac + '\n';
+    }
+    else {
+        output += inner + 'expected: ' + ex + '\n';
+        output += inner + 'actual:   ' + ac + '\n';
+    }
+    if (res.at) {
+        output += inner + 'at: ' + res.at + '\n';
+    }
+    if (res.operator === 'error' && res.actual && res.actual.stack) {
+        var lines = String(res.actual.stack).split('\n');
+        output += inner + 'stack:\n';
+        output += inner + '  ' + lines[0] + '\n';
+        for (var i = 1; i < lines.length; i++) {
+            output += inner + lines[i] + '\n';
         }
-        
-        output += outer + '...\n';
     }
-    
+     
+    output += outer + '...\n';
     return output;
 }
 
-function getSerialize() {
+function getSerialize () {
     var seen = [];
 
     return function (key, value) {
         var ret = value;
         if (typeof value === 'object' && value) {
-            var found = false
+            var found = false;
             for (var i = 0; i < seen.length; i++) {
                 if (seen[i] === value) {
                     found = true