remove .bind(), formatting

Author: James Halliday

lib/test.js

@@ -42,6 +42,9 @@ function Test (name_, opts_, cb_) {
     this._cb = cb;
     this._progeny = [];
     this._ok = true;
+    this.end = function () {
+        return Test.prototype.end.apply(self, arguments);
+    };
 }
 
 Test.prototype.run = function () {
@@ -92,9 +95,12 @@ Test.prototype.plan = function (n) {
     this.emit('plan', n);
 };
 
-Test.prototype.end = function () {
+Test.prototype.end = function (err) {
     var self = this;
-
+    if (arguments.length === 1) {
+        this.ifError(err);
+    }
+    
     if (this._progeny.length) {
         var t = this._progeny.shift();
         t.on('end', function () {
@@ -136,11 +142,11 @@ Test.prototype._exit = function () {
 Test.prototype._pendingAsserts = function () {
     if (this._plan === undefined) {
         return 1;
-    } else {
-        return this._plan -
-            (this._progeny.length + this.assertCount);
     }
-}
+    else {
+        return this._plan - (this._progeny.length + this.assertCount);
+    }
+};
 
 Test.prototype._assert = function assert (ok, opts) {
     var self = this;

test/end-as-callback.js

@@ -0,0 +1,66 @@
+var tap = require("tap");
+var tape = require("../");
+
+tap.test("tape assert.end as callback", function (tt) {
+    var test = tape.createHarness({ exit: false })
+    var tc = tap.createConsumer()
+
+    var rows = []
+    tc.on("data", function (r) { rows.push(r) })
+    tc.on("end", function () {
+        var rs = rows.map(function (r) {
+            return r && typeof r === "object" ?
+                { id: r.id, ok: r.ok, name: r.name.trim() } :
+                r
+        })
+
+        tt.deepEqual(rs, [
+            "TAP version 13",
+            "do a task and write",
+            { id: 1, ok: true, name: "null" },
+            { id: 2, ok: true, name: "should be equal" },
+            { id: 3, ok: true, name: "null" },
+            "do a task and write fail",
+            { id: 4, ok: true, name: "null" },
+            { id: 5, ok: true, name: "should be equal" },
+            { id: 6, ok: false, name: "Error: fail" },
+            "tests 6",
+            "pass  5",
+            "fail  1"
+        ])
+
+        tt.end()
+    })
+
+    test.createStream().pipe(tc)
+
+    test("do a task and write", function (assert) {
+        fakeAsyncTask("foo", function (err, value) {
+            assert.ifError(err)
+            assert.equal(value, "taskfoo")
+
+            fakeAsyncWrite("bar", assert.end)
+        })
+    })
+
+    test("do a task and write fail", function (assert) {
+        fakeAsyncTask("bar", function (err, value) {
+            assert.ifError(err)
+            assert.equal(value, "taskbar")
+
+            fakeAsyncWriteFail("baz", assert.end)
+        })
+    })
+})
+
+function fakeAsyncTask(name, cb) {
+    cb(null, "task" + name)
+}
+
+function fakeAsyncWrite(name, cb) {
+    cb(null)
+}
+
+function fakeAsyncWriteFail(name, cb) {
+    cb(new Error("fail"))
+}