From f6b844ec13e57391e37bd8eb4ab1c58aa7ef98fc Mon Sep 17 00:00:00 2001 From: James Halliday Date: Sun, 25 Nov 2012 09:02:27 -0800 Subject: [PATCH] remove nested test indents to pass the tests --- lib/render.js | 6 +++--- lib/test.js | 4 +--- test/nested.js | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/render.js b/lib/render.js index 00a9990e..e942fe79 100644 --- a/lib/render.js +++ b/lib/render.js @@ -24,7 +24,7 @@ Render.prototype.begin = function () { Render.prototype.push = function (t) { var self = this; - this.emit('data', Array(t.indent + 1).join(' ') + '# ' + t.name + '\n'); + this.emit('data', '# ' + t.name + '\n'); t.on('result', function (res) { self.emit('data', encodeResult(res, self.count + 1)); @@ -50,7 +50,7 @@ Render.prototype.close = function () { }; function encodeResult (res, count) { - var output = Array(res.indent + 1).join(' '); + var output = ''; output += (res.ok ? 'ok ' : 'not ok ') + count; output += res.name ? ' ' + res.name.replace(/\s+/g, ' ') : ''; @@ -60,7 +60,7 @@ function encodeResult (res, count) { output += '\n'; if (!res.ok) { - var outer = Array(res.indent + 3).join(' '); + var outer = ' '; var inner = outer + ' '; output += outer + '---\n'; output += inner + 'operator: ' + res.operator + '\n'; diff --git a/lib/test.js b/lib/test.js index c5be6621..1e9dd288 100644 --- a/lib/test.js +++ b/lib/test.js @@ -12,7 +12,6 @@ function Test (name, opts) { this.name = name || '(anonymous)'; this.assertCount = 0; - this.indent = opts.indent || 0; } Test.prototype.test = function (name, cb) { @@ -23,7 +22,7 @@ Test.prototype.test = function (name, cb) { name = '(anonymous)'; } - var t = new Test(name, { indent : self.indent + 2 }); + var t = new Test(name); t.run = function () { cb(t) }; self.emit('test', t); }; @@ -55,7 +54,6 @@ Test.prototype._assert = function assert (ok, opts) { var res = { id : self.assertCount ++, - indent : self.indent, ok : Boolean(ok), skip : defined(extra.skip, opts.skip), name : defined(extra.message, opts.message, '(unnamed assert)'), diff --git a/test/nested.js b/test/nested.js index 7a1d24f7..418a65d1 100644 --- a/test/nested.js +++ b/test/nested.js @@ -25,7 +25,7 @@ tap.test('array test', function (tt) { { id: 3, ok: true, name: 'should be equivalent' }, { id: 4, ok: true, name: 'should be equivalent' }, { id: 5, ok: true, name: 'should be equivalent' }, - '# inside test', + 'inside test', { id: 6, ok: true, name: '(unnamed assert)' }, { id: 7, ok: true, name: '(unnamed assert)' }, 'another',