From b9ab50ea47a72d61331d9fc55d684b3aa919d393 Mon Sep 17 00:00:00 2001 From: nelsonic Date: Fri, 2 Sep 2016 19:50:40 +0100 Subject: [PATCH] update test/fail.js to use concat-stream instead of tap.createConsumer (method unavailable in tap v7) see #312 --- test/fail.js | 62 +++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/test/fail.js b/test/fail.js index c39666ae..40710a64 100644 --- a/test/fail.js +++ b/test/fail.js @@ -1,61 +1,59 @@ var falafel = require('falafel'); var tape = require('../'); var tap = require('tap'); -var trim = require('string.prototype.trim'); +var concat = require('concat-stream'); tap.test('array test', function (tt) { tt.plan(1); - + 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) { - if (r && typeof r === 'object') { - return { id : r.id, ok : r.ok, name : trim(r.name) }; - } - else return r; - }); - tt.same(rs, [ + var tc = function (rows) { + tt.same(rows.toString('utf8'), [ 'TAP version 13', - 'array', - { id: 1, ok: true, name: 'should be equivalent' }, - { id: 2, ok: true, name: 'should be equivalent' }, - { id: 3, ok: true, name: 'should be equivalent' }, - { id: 4, ok: true, name: 'should be equivalent' }, - { id: 5, ok: false, name: 'should be equivalent' }, - 'tests 5', - 'pass 4', - 'fail 1' - ]); - }); - - test.createStream().pipe(tc); - + '# array', + 'ok 1 should be equivalent', + 'ok 2 should be equivalent', + 'ok 3 should be equivalent', + 'ok 4 should be equivalent', + 'not ok 5 should be equivalent', + ' ---', + ' operator: deepEqual', + ' expected: [ [ 1, 2, [ 3, 4444 ] ], [ 5, 6 ] ]', + ' actual: [ [ 1, 2, [ 3, 4 ] ], [ 5, 6 ] ]', + ' ...', + '', + '1..5', + '# tests 5', + '# pass 4', + '# fail 1', + '' + ].join('\n')); + }; + + test.createStream().pipe(concat(tc)); + test('array', function (t) { t.plan(5); - + var src = '(' + function () { var xs = [ 1, 2, [ 3, 4 ] ]; var ys = [ 5, 6 ]; g([ xs, ys ]); } + ')()'; - + var output = falafel(src, function (node) { if (node.type === 'ArrayExpression') { node.update('fn(' + node.source() + ')'); } }); - + var arrays = [ [ 3, 4 ], [ 1, 2, [ 3, 4 ] ], [ 5, 6 ], [ [ 1, 2, [ 3, 4 ] ], [ 5, 6 ] ], ]; - + Function(['fn','g'], output)( function (xs) { t.same(arrays.shift(), xs);