From b03d4c8e722841d580a581a5d492277a7c701f94 Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Mon, 26 Jul 2021 12:28:52 -0700 Subject: [PATCH] [eslint] update `no-redeclare` --- test/async-await.js | 6 ++---- test/stackTrace.js | 21 +++++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/test/async-await.js b/test/async-await.js index b380dfaa..b34a0499 100644 --- a/test/async-await.js +++ b/test/async-await.js @@ -238,15 +238,13 @@ tap.test('async-error', function (t) { t.same(r.exitCode, 1); var stderr = r.stderr.toString('utf8'); - var lines = stderr.split('\n'); - lines = lines.filter(function (line) { + var stderrLines = stderr.split('\n').filter(function (line) { return !(/\(timers.js:/).test(line) && !(/\(internal\/timers.js:/).test(line) && !(/Immediate\.next/).test(line); }); - stderr = lines.join('\n'); - t.same(stderr, ''); + t.same(stderrLines.join('\n'), ''); t.end(); }); }); diff --git a/test/stackTrace.js b/test/stackTrace.js index 18616ba0..e517077a 100644 --- a/test/stackTrace.js +++ b/test/stackTrace.js @@ -28,10 +28,9 @@ tap.test('preserves stack trace with newlines', function (tt) { }); stream.pipe(concat(function (body) { - var body = body.toString('utf8'); - body = stripAt(body); + var strippedBody = stripAt(body.toString('utf8')); tt.equal( - body, + strippedBody, 'TAP version 13\n' + '# multiline stack trace\n' + 'not ok 1 Error: Preserve stack\n' @@ -48,7 +47,7 @@ tap.test('preserves stack trace with newlines', function (tt) { + '# fail 1\n' ); - tt.deepEqual(getDiag(body), { + tt.deepEqual(getDiag(strippedBody), { stack: stackTrace, operator: 'error' }); @@ -187,10 +186,9 @@ tap.test('preserves stack trace for failed assertions', function (tt) { }); stream.pipe(concat(function (body) { - var body = body.toString('utf8'); - body = stripAt(body); + var strippedBody = stripAt(body.toString('utf8')); tt.equal( - body, + strippedBody, 'TAP version 13\n' + '# t.equal stack trace\n' + 'not ok 1 true should be false\n' @@ -209,7 +207,7 @@ tap.test('preserves stack trace for failed assertions', function (tt) { + '# fail 1\n' ); - tt.deepEqual(getDiag(body), { + tt.deepEqual(getDiag(strippedBody), { stack: stack, operator: 'equal', expected: false, @@ -252,10 +250,9 @@ tap.test('preserves stack trace for failed assertions where actual===falsy', fun }); stream.pipe(concat(function (body) { - var body = body.toString('utf8'); - body = stripAt(body); + var strippedBody = stripAt(body.toString('utf8')); tt.equal( - body, + strippedBody, 'TAP version 13\n' + '# t.equal stack trace\n' + 'not ok 1 false should be true\n' @@ -274,7 +271,7 @@ tap.test('preserves stack trace for failed assertions where actual===falsy', fun + '# fail 1\n' ); - tt.deepEqual(getDiag(body), { + tt.deepEqual(getDiag(strippedBody), { stack: stack, operator: 'equal', expected: true,