From d866a28a6bb46dac224a727aa66599c3d1e59aeb Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Fri, 29 Jul 2022 09:31:50 -0400 Subject: [PATCH 1/3] test: update tap reporter version to 14 --- lib/internal/test_runner/tap_stream.js | 2 +- lib/internal/test_runner/test.js | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/internal/test_runner/tap_stream.js b/lib/internal/test_runner/tap_stream.js index ca0c101aa9260c..7208951264e08e 100644 --- a/lib/internal/test_runner/tap_stream.js +++ b/lib/internal/test_runner/tap_stream.js @@ -89,7 +89,7 @@ class TapStream extends Readable { } version() { - this.#tryPush('TAP version 13\n'); + this.#tryPush('TAP version 14\n'); } #test(indent, testNumber, status, description, directive) { diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js index 0755c42750ac87..5e9375df6ce519 100644 --- a/lib/internal/test_runner/test.js +++ b/lib/internal/test_runner/test.js @@ -488,8 +488,6 @@ class Test extends AsyncResource { // Output this test's results and update the parent's waiting counter. if (this.subtests.length > 0) { this.reporter.plan(this.subtests[0].indent, this.subtests.length); - } else { - this.reporter.subtest(this.indent, this.name); } this.report(); From 23d64af31563a85a68638abf822f4782c1261a11 Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Tue, 2 Aug 2022 08:18:28 -0400 Subject: [PATCH 2/3] test: revert changes to subtest print for tap 14 --- lib/internal/test_runner/test.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js index 5e9375df6ce519..0755c42750ac87 100644 --- a/lib/internal/test_runner/test.js +++ b/lib/internal/test_runner/test.js @@ -488,6 +488,8 @@ class Test extends AsyncResource { // Output this test's results and update the parent's waiting counter. if (this.subtests.length > 0) { this.reporter.plan(this.subtests[0].indent, this.subtests.length); + } else { + this.reporter.subtest(this.indent, this.name); } this.report(); From 4720cd1043d8aec63c0b178230bb6a4c4983ff28 Mon Sep 17 00:00:00 2001 From: Yagiz Nizipli Date: Tue, 2 Aug 2022 08:19:07 -0400 Subject: [PATCH 3/3] test: update tap version to 14 on messages --- test/message/test_runner_abort.out | 2 +- test/message/test_runner_abort_suite.out | 2 +- test/message/test_runner_describe_it.out | 6 +++--- test/message/test_runner_no_refs.out | 2 +- test/message/test_runner_only_tests.out | 2 +- test/message/test_runner_output.out | 2 +- test/message/test_runner_unresolved_promise.out | 2 +- tools/node_modules/eslint/lib/cli-engine/formatters/tap.js | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/message/test_runner_abort.out b/test/message/test_runner_abort.out index 26f89a29dbb8f7..c921155cbd898b 100644 --- a/test/message/test_runner_abort.out +++ b/test/message/test_runner_abort.out @@ -1,4 +1,4 @@ -TAP version 13 +TAP version 14 # Subtest: promise timeout signal # Subtest: ok 1 ok 1 - ok 1 diff --git a/test/message/test_runner_abort_suite.out b/test/message/test_runner_abort_suite.out index 38669978406b4f..94dfc89c017947 100644 --- a/test/message/test_runner_abort_suite.out +++ b/test/message/test_runner_abort_suite.out @@ -1,4 +1,4 @@ -TAP version 13 +TAP version 14 # Subtest: describe timeout signal # Subtest: ok 1 ok 1 - ok 1 diff --git a/test/message/test_runner_describe_it.out b/test/message/test_runner_describe_it.out index 7961345b976f73..7511852530a2ab 100644 --- a/test/message/test_runner_describe_it.out +++ b/test/message/test_runner_describe_it.out @@ -1,4 +1,4 @@ -TAP version 13 +TAP version 14 # Subtest: sync pass todo ok 1 - sync pass todo # TODO --- @@ -116,9 +116,9 @@ not ok 13 - async assertion fail failureType: 'testCodeFailure' error: |- Expected values to be strictly equal: - + true !== false - + code: 'ERR_ASSERTION' stack: |- * diff --git a/test/message/test_runner_no_refs.out b/test/message/test_runner_no_refs.out index 63b79cd57d777f..02c2eb727a5718 100644 --- a/test/message/test_runner_no_refs.out +++ b/test/message/test_runner_no_refs.out @@ -1,4 +1,4 @@ -TAP version 13 +TAP version 14 # Subtest: does not keep event loop alive # Subtest: +does not keep event loop alive not ok 1 - +does not keep event loop alive diff --git a/test/message/test_runner_only_tests.out b/test/message/test_runner_only_tests.out index c471a5284e7ebc..ae87b37804f50e 100644 --- a/test/message/test_runner_only_tests.out +++ b/test/message/test_runner_only_tests.out @@ -1,4 +1,4 @@ -TAP version 13 +TAP version 14 # Subtest: only = undefined ok 1 - only = undefined # SKIP 'only' option not set --- diff --git a/test/message/test_runner_output.out b/test/message/test_runner_output.out index 22d97940a36f9c..7059bed6865ef5 100644 --- a/test/message/test_runner_output.out +++ b/test/message/test_runner_output.out @@ -1,4 +1,4 @@ -TAP version 13 +TAP version 14 # Subtest: sync pass todo ok 1 - sync pass todo # TODO --- diff --git a/test/message/test_runner_unresolved_promise.out b/test/message/test_runner_unresolved_promise.out index d4e868cc9ef3c3..08e006fd46a02c 100644 --- a/test/message/test_runner_unresolved_promise.out +++ b/test/message/test_runner_unresolved_promise.out @@ -1,4 +1,4 @@ -TAP version 13 +TAP version 14 # Subtest: pass ok 1 - pass --- diff --git a/tools/node_modules/eslint/lib/cli-engine/formatters/tap.js b/tools/node_modules/eslint/lib/cli-engine/formatters/tap.js index e4148a3b3929a0..3a006dac5de064 100644 --- a/tools/node_modules/eslint/lib/cli-engine/formatters/tap.js +++ b/tools/node_modules/eslint/lib/cli-engine/formatters/tap.js @@ -41,7 +41,7 @@ function outputDiagnostics(diagnostic) { //------------------------------------------------------------------------------ module.exports = function(results) { - let output = `TAP version 13\n1..${results.length}\n`; + let output = `TAP version 14\n1..${results.length}\n`; results.forEach((result, id) => { const messages = result.messages;