Handle children in order, and grandchildren

Fix #5
Fix #6

Author: isaacs

index.js

@@ -14,10 +14,6 @@ function createHarness () {
     var out = new Render();
 
     var test = function (name, conf, cb) {
-        if (typeof conf === 'function') {
-            cb = conf;
-            conf = {};
-        }
         var t = new Test(name, conf, cb);
 
         process.nextTick(function () {
@@ -37,20 +33,26 @@ function createHarness () {
             else run();
         });
 
-        t.on('test', function (st) {
-            pending.unshift(function () {
-                running = true;
-                out.push(st);
-                st.run();
-                
-                st.on('end', onend);
-            });
+        t.on('test', function sub (st) {
+            st.on('test', sub);
+            st.on('end', onend);
         });
 
         t.on('end', onend);
 
         function onend () {
             running = false;
+            if (this._progeny.length) {
+                var unshifts = this._progeny.map(function (st) {
+                    return function () {
+                        running = true;
+                        out.push(st);
+                        st.run();
+                    };
+                });
+                pending.unshift.apply(pending, unshifts);
+            }
+
             process.nextTick(function () {
                 if (pending.length) pending.shift()()
                 else out.close()

lib/test.js

@@ -31,6 +31,7 @@ function Test (name_, opts_, cb_) {
     this._skip = opts.skip || false;
     this._plan = undefined;
     this._cb = cb;
+    this._progeny = [];
 }
 
 Test.prototype.run = function () {
@@ -42,9 +43,9 @@ Test.prototype.run = function () {
 };
 
 Test.prototype.test = function (name, opts, cb) {
-    var self = this;
     var t = new Test(name, opts, cb);
-    self.emit('test', t);
+    this._progeny.push(t);
+    this.emit('test', t);
 };
 
 Test.prototype.comment = function (msg) {

test/child_ordering.js

@@ -16,4 +16,36 @@ test('uncle', function(t) {
     t.end();
 });
 
+var grandParentRan = false;
+var parentRan = false;
+var grandChildRan = false;
+test('grandparent', function(t) {
+    grandParentRan = true;
+    t.test('parent', function(t) {
+        parentRan = true;
+        t.test('grandchild', function(t) {
+            grandChildRan = true;
+            t.pass('grand child ran');
+            t.end();
+        });
+        t.pass('parent ran');
+        t.end();
+    });
+    t.test('other parent', function(t) {
+        t.ok(parentRan, 'first parent runs before second parent');
+        t.ok(grandChildRan, 'grandchild runs before second parent');
+        t.end();
+    });
+    t.pass('grandparent ran');
+    t.end();
+});
+
+test('second grandparent', function(t) {
+    t.ok(grandParentRan, 'grandparent ran');
+    t.ok(parentRan, 'parent ran');
+    t.ok(grandChildRan, 'grandchild ran');
+    t.pass('other grandparent ran');
+    t.end();
+});
+
 // vim: set softtabstop=4 shiftwidth=4: