Upgrade supertap and print t.log entries according to TAP diagnostics spec

tymfear · Daudov, Tymur · novemberborn · web-flow · commit 99ab93ada750 · 2020-12-23T15:21:46.000+01:00
Co-authored-by: Daudov, Tymur &lt;tymur.daudov@f-secure.com&gt;
Co-authored-by: Mark Wubben &lt;mark@novemberborn.net&gt;
diff --git a/lib/reporters/tap.js b/lib/reporters/tap.js
@@ -125,7 +125,7 @@ class TapReporter {
 		this.reportStream.write(`# ${stripAnsi(title)}${os.EOL}`);
 		if (evt.logs) {
 			for (const log of evt.logs) {
-				const logLines = indentString(log, 4).replace(/^ {4}/, '  # ');
+				const logLines = indentString(log, 4).replace(/^ {4}/gm, '#   ');
 				this.reportStream.write(`${logLines}${os.EOL}`);
 			}
 		}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -106,7 +106,7 @@
 		"source-map-support": "^0.5.19",
 		"stack-utils": "^2.0.3",
 		"strip-ansi": "^6.0.0",
-		"supertap": "^1.0.0",
+		"supertap": "^2.0.0",
 		"temp-dir": "^2.0.0",
 		"trim-off-newlines": "^1.0.1",
 		"update-notifier": "^5.0.1",
diff --git a/test-tap/reporters/tap.edgecases.v10.log b/test-tap/reporters/tap.edgecases.v10.log
@@ -1,9 +1,7 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# No tests found in ava-import-no-test-declaration.js
 not ok 1 - No tests found in ava-import-no-test-declaration.js
 ---tty-stream-chunk-separator
-# TypeError: test is not a function
 not ok 2 - TypeError: test is not a function
   ---
     name: TypeError
@@ -13,21 +11,17 @@ not ok 2 - TypeError: test is not a function
       (test-tap/fixture/report/edgecases/import-and-use-test-member.js:3:1)
   ...
 ---tty-stream-chunk-separator
-# import-and-use-test-member.js exited with a non-zero exit code: 1
 not ok 3 - import-and-use-test-member.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
-# No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 not ok 4 - No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 ---tty-stream-chunk-separator
-# Error: throws
 not ok 5 - Error: throws
   ---
     name: Error
     message: throws
     at: 'Object.<anonymous> (test-tap/fixture/report/edgecases/throws.js:1:7)'
   ...
 ---tty-stream-chunk-separator
-# throws.js exited with a non-zero exit code: 1
 not ok 6 - throws.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
 
diff --git a/test-tap/reporters/tap.edgecases.v12.log b/test-tap/reporters/tap.edgecases.v12.log
@@ -1,9 +1,7 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# No tests found in ava-import-no-test-declaration.js
 not ok 1 - No tests found in ava-import-no-test-declaration.js
 ---tty-stream-chunk-separator
-# TypeError: test is not a function
 not ok 2 - TypeError: test is not a function
   ---
     name: TypeError
@@ -13,21 +11,17 @@ not ok 2 - TypeError: test is not a function
       (test-tap/fixture/report/edgecases/import-and-use-test-member.js:3:1)
   ...
 ---tty-stream-chunk-separator
-# import-and-use-test-member.js exited with a non-zero exit code: 1
 not ok 3 - import-and-use-test-member.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
-# No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 not ok 4 - No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 ---tty-stream-chunk-separator
-# Error: throws
 not ok 5 - Error: throws
   ---
     name: Error
     message: throws
     at: 'Object.<anonymous> (test-tap/fixture/report/edgecases/throws.js:1:7)'
   ...
 ---tty-stream-chunk-separator
-# throws.js exited with a non-zero exit code: 1
 not ok 6 - throws.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
 
diff --git a/test-tap/reporters/tap.edgecases.v14.log b/test-tap/reporters/tap.edgecases.v14.log
@@ -1,9 +1,7 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# No tests found in ava-import-no-test-declaration.js
 not ok 1 - No tests found in ava-import-no-test-declaration.js
 ---tty-stream-chunk-separator
-# TypeError: test is not a function
 not ok 2 - TypeError: test is not a function
   ---
     name: TypeError
@@ -13,21 +11,17 @@ not ok 2 - TypeError: test is not a function
       (test-tap/fixture/report/edgecases/import-and-use-test-member.js:3:1)
   ...
 ---tty-stream-chunk-separator
-# import-and-use-test-member.js exited with a non-zero exit code: 1
 not ok 3 - import-and-use-test-member.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
-# No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 not ok 4 - No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 ---tty-stream-chunk-separator
-# Error: throws
 not ok 5 - Error: throws
   ---
     name: Error
     message: throws
     at: 'Object.<anonymous> (test-tap/fixture/report/edgecases/throws.js:1:7)'
   ...
 ---tty-stream-chunk-separator
-# throws.js exited with a non-zero exit code: 1
 not ok 6 - throws.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
 
diff --git a/test-tap/reporters/tap.edgecases.v15.log b/test-tap/reporters/tap.edgecases.v15.log
@@ -1,9 +1,7 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# No tests found in ava-import-no-test-declaration.js
 not ok 1 - No tests found in ava-import-no-test-declaration.js
 ---tty-stream-chunk-separator
-# TypeError: test is not a function
 not ok 2 - TypeError: test is not a function
   ---
     name: TypeError
@@ -13,21 +11,17 @@ not ok 2 - TypeError: test is not a function
       (test-tap/fixture/report/edgecases/import-and-use-test-member.js:3:1)
   ...
 ---tty-stream-chunk-separator
-# import-and-use-test-member.js exited with a non-zero exit code: 1
 not ok 3 - import-and-use-test-member.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
-# No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 not ok 4 - No tests found in no-ava-import.js, make sure to import "ava" at the top of your test file
 ---tty-stream-chunk-separator
-# Error: throws
 not ok 5 - Error: throws
   ---
     name: Error
     message: throws
     at: 'Object.<anonymous> (test-tap/fixture/report/edgecases/throws.js:1:7)'
   ...
 ---tty-stream-chunk-separator
-# throws.js exited with a non-zero exit code: 1
 not ok 6 - throws.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
 
diff --git a/test-tap/reporters/tap.failfast.v10.log b/test-tap/reporters/tap.failfast.v10.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.failfast.v12.log b/test-tap/reporters/tap.failfast.v12.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.failfast.v14.log b/test-tap/reporters/tap.failfast.v14.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.failfast.v15.log b/test-tap/reporters/tap.failfast.v15.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.failfast2.v10.log b/test-tap/reporters/tap.failfast2.v10.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.failfast2.v12.log b/test-tap/reporters/tap.failfast2.v12.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.failfast2.v14.log b/test-tap/reporters/tap.failfast2.v14.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.failfast2.v15.log b/test-tap/reporters/tap.failfast2.v15.log
@@ -1,7 +1,6 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › fails
-not ok 1 - a [90m[2m›[22m[39m fails
+not ok 1 - a › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
diff --git a/test-tap/reporters/tap.only.v10.log b/test-tap/reporters/tap.only.v10.log
@@ -1,10 +1,8 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › only
-ok 1 - a [90m[2m›[22m[39m only
+ok 1 - a › only
 ---tty-stream-chunk-separator
-# b › passes
-ok 2 - b [90m[2m›[22m[39m passes
+ok 2 - b › passes
 ---tty-stream-chunk-separator
 
 1..2
diff --git a/test-tap/reporters/tap.only.v12.log b/test-tap/reporters/tap.only.v12.log
@@ -1,10 +1,8 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › only
-ok 1 - a [90m[2m›[22m[39m only
+ok 1 - a › only
 ---tty-stream-chunk-separator
-# b › passes
-ok 2 - b [90m[2m›[22m[39m passes
+ok 2 - b › passes
 ---tty-stream-chunk-separator
 
 1..2
diff --git a/test-tap/reporters/tap.only.v14.log b/test-tap/reporters/tap.only.v14.log
@@ -1,10 +1,8 @@
 TAP version 13
 ---tty-stream-chunk-separator
-# a › only
-ok 1 - a [90m[2m›[22m[39m only
+ok 1 - a › only
 ---tty-stream-chunk-separator
-# b › passes
-ok 2 - b [90m[2m›[22m[39m passes
+ok 2 - b › passes
 ---tty-stream-chunk-separator
 
 1..2
diff --git a/test-tap/reporters/tap.only.v15.log b/test-tap/reporters/tap.only.v15.log
diff --git a/test-tap/reporters/tap.regular.v10.log b/test-tap/reporters/tap.regular.v10.log
diff --git a/test-tap/reporters/tap.regular.v12.log b/test-tap/reporters/tap.regular.v12.log
diff --git a/test-tap/reporters/tap.regular.v14.log b/test-tap/reporters/tap.regular.v14.log
diff --git a/test-tap/reporters/tap.regular.v15.log b/test-tap/reporters/tap.regular.v15.log

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ class TapReporter {`
`125`	`125`	this.reportStream.write(`# ${stripAnsi(title)}${os.EOL}`);
`126`	`126`	`if (evt.logs) {`
`127`	`127`	`for (const log of evt.logs) {`
`128`		`- const logLines = indentString(log, 4).replace(/^ {4}/, ' # ');`
	`128`	`+ const logLines = indentString(log, 4).replace(/^ {4}/gm, '# ');`
`129`	`129`	this.reportStream.write(`${logLines}${os.EOL}`);
`130`	`130`	`}`
`131`	`131`	`}`
-Original file line number
+Diff line change
 TAP version 13
 ---tty-stream-chunk-separator
 -# TypeError: test.serial.test is not a function
 not ok 1 - TypeError: test.serial.test is not a function
   ---
     name: TypeError
     message: test.serial.test is not a function
     at: 'Object.<anonymous> (test-tap/fixture/report/regular/bad-test-chain.js:3:13)'
   ...
 ---tty-stream-chunk-separator
 -# bad-test-chain.js exited with a non-zero exit code: 1
 not ok 2 - bad-test-chain.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
 -# nested-objects › format with max depth 4
 -not ok 3 - nested-objects [90m[2m›[22m[39m format with max depth 4
 +not ok 3 - nested-objects › format with max depth 4
   ---
     name: AssertionError
     assertion: deepEqual
     at: 't (test-tap/fixture/report/regular/nested-objects.js:28:4)'
   ...
 ---tty-stream-chunk-separator
 -# nested-objects › format like with max depth 4
 -not ok 4 - nested-objects [90m[2m›[22m[39m format like with max depth 4
 +not ok 4 - nested-objects › format like with max depth 4
   ---
     name: AssertionError
     assertion: like
 ---tty-stream-chunk-separator
 # output-in-hook › before hook
 ---tty-stream-chunk-separator
 -  # before
 +#   before
 ---tty-stream-chunk-separator
 # output-in-hook › beforeEach hook for passing test
 ---tty-stream-chunk-separator
 -  # beforeEach
 +#   beforeEach
 ---tty-stream-chunk-separator
 # output-in-hook › beforeEach hook for failing test
 ---tty-stream-chunk-separator
 -  # beforeEach
 +#   beforeEach
 ---tty-stream-chunk-separator
 -# output-in-hook › passing test
 -ok 5 - output-in-hook [90m[2m›[22m[39m passing test
 +ok 5 - output-in-hook › passing test
 ---tty-stream-chunk-separator
 -# output-in-hook › failing test
 -not ok 6 - output-in-hook [90m[2m›[22m[39m failing test
 +not ok 6 - output-in-hook › failing test
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
 ---tty-stream-chunk-separator
 # output-in-hook › afterEach hook for passing test
 ---tty-stream-chunk-separator
 -  # afterEach
 +#   afterEach
 ---tty-stream-chunk-separator
 # output-in-hook › afterEach.always hook for failing test
 ---tty-stream-chunk-separator
 -  # afterEachAlways
 +#   afterEachAlways
 ---tty-stream-chunk-separator
 # output-in-hook › afterEach.always hook for passing test
 ---tty-stream-chunk-separator
 -  # afterEachAlways
 +#   afterEachAlways
 ---tty-stream-chunk-separator
 # output-in-hook › cleanup
 ---tty-stream-chunk-separator
 -  # afterAlways
 +#   afterAlways
 ---tty-stream-chunk-separator
 -# test › skip
 -ok 7 - test [90m[2m›[22m[39m skip # SKIP
 +ok 7 - test › skip # SKIP
 ---tty-stream-chunk-separator
 -# test › todo
 -not ok 8 - test [90m[2m›[22m[39m todo # TODO
 +not ok 8 - test › todo # TODO
 ---tty-stream-chunk-separator
 -# test › passes
 -ok 9 - test [90m[2m›[22m[39m passes
 +ok 9 - test › passes
 ---tty-stream-chunk-separator
 -# test › fails
 -not ok 10 - test [90m[2m›[22m[39m fails
 +not ok 10 - test › fails
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
     assertion: fail
     at: 't (test-tap/fixture/report/regular/test.js:9:22)'
   ...
 ---tty-stream-chunk-separator
 -# test › known failure
 -ok 11 - test [90m[2m›[22m[39m known failure
 +ok 11 - test › known failure
 ---tty-stream-chunk-separator
 -# test › no longer failing
 -not ok 12 - test [90m[2m›[22m[39m no longer failing
 +not ok 12 - test › no longer failing
   ---
     name: Error
     message: >-
     at: ''
   ...
 ---tty-stream-chunk-separator
 -# test › logs
 -not ok 13 - test [90m[2m›[22m[39m logs
 -  * hello
 -  * world
 +not ok 13 - test › logs
 +#   hello
 +#   world
   ---
     name: AssertionError
     message: Test failed via `t.fail()`
     assertion: fail
     at: 't (test-tap/fixture/report/regular/test.js:18:4)'
   ...
 ---tty-stream-chunk-separator
 -# test › formatted
 -not ok 14 - test [90m[2m›[22m[39m formatted
 +not ok 14 - test › formatted
   ---
     name: AssertionError
     assertion: deepEqual
     at: 't (test-tap/fixture/report/regular/test.js:22:4)'
   ...
 ---tty-stream-chunk-separator
 -# test › power-assert
 -not ok 15 - test [90m[2m›[22m[39m power-assert
 +not ok 15 - test › power-assert
   ---
     name: AssertionError
     assertion: assert
     at: 't (test-tap/fixture/report/regular/test.js:27:4)'
   ...
 ---tty-stream-chunk-separator
 -# test › bad throws
 -not ok 16 - test [90m[2m›[22m[39m bad throws
 +not ok 16 - test › bad throws
   ---
     name: AssertionError
     message: Improper usage of `t.throws()` detected
       t (test-tap/fixture/report/regular/test.js:35:11)
   ...
 ---tty-stream-chunk-separator
 -# test › bad notThrows
 -not ok 17 - test [90m[2m›[22m[39m bad notThrows
 +not ok 17 - test › bad notThrows
   ---
     name: AssertionError
     message: Improper usage of `t.notThrows()` detected
       t (test-tap/fixture/report/regular/test.js:43:14)
   ...
 ---tty-stream-chunk-separator
 -# test › implementation throws non-error
 -not ok 18 - test [90m[2m›[22m[39m implementation throws non-error
 +not ok 18 - test › implementation throws non-error
   ---
     name: AssertionError
     message: Error thrown in test
     at: ''
   ...
 ---tty-stream-chunk-separator
 -# traces-in-t-throws › throws
 -not ok 19 - traces-in-t-throws [90m[2m›[22m[39m throws
 +not ok 19 - traces-in-t-throws › throws
   ---
     name: AssertionError
     assertion: throws
       t (test-tap/fixture/report/regular/traces-in-t-throws.js:12:4)
   ...
 ---tty-stream-chunk-separator
 -# traces-in-t-throws › notThrows
 -not ok 20 - traces-in-t-throws [90m[2m›[22m[39m notThrows
 +not ok 20 - traces-in-t-throws › notThrows
   ---
     name: AssertionError
     assertion: notThrows
       t (test-tap/fixture/report/regular/traces-in-t-throws.js:16:4)
   ...
 ---tty-stream-chunk-separator
 -# traces-in-t-throws › notThrowsAsync
 -not ok 21 - traces-in-t-throws [90m[2m›[22m[39m notThrowsAsync
 +not ok 21 - traces-in-t-throws › notThrowsAsync
   ---
     name: AssertionError
     assertion: notThrowsAsync
       t (test-tap/fixture/report/regular/traces-in-t-throws.js:20:4)
   ...
 ---tty-stream-chunk-separator
 -# traces-in-t-throws › throwsAsync
 -not ok 22 - traces-in-t-throws [90m[2m›[22m[39m throwsAsync
 +not ok 22 - traces-in-t-throws › throwsAsync
   ---
     name: AssertionError
     assertion: throwsAsync
       t (test-tap/fixture/report/regular/traces-in-t-throws.js:24:4)
   ...
 ---tty-stream-chunk-separator
 -# traces-in-t-throws › throwsAsync different error
 -not ok 23 - traces-in-t-throws [90m[2m›[22m[39m throwsAsync different error
 +not ok 23 - traces-in-t-throws › throwsAsync different error
   ---
     name: AssertionError
     assertion: throwsAsync
       t (test-tap/fixture/report/regular/traces-in-t-throws.js:28:11)
   ...
 ---tty-stream-chunk-separator
 -# uncaught-exception › passes
 -ok 24 - uncaught-exception [90m[2m›[22m[39m passes
 +ok 24 - uncaught-exception › passes
 ---tty-stream-chunk-separator
 -# Error: Can’t catch me
 not ok 25 - Error: Can’t catch me
   ---
     name: Error
       (test-tap/fixture/report/regular/uncaught-exception.js:5:9)
   ...
 ---tty-stream-chunk-separator
 -# uncaught-exception.js exited with a non-zero exit code: 1
 not ok 26 - uncaught-exception.js exited with a non-zero exit code: 1
 ---tty-stream-chunk-separator
 -# unhandled-rejection › passes
 -ok 27 - unhandled-rejection [90m[2m›[22m[39m passes
 +ok 27 - unhandled-rejection › passes
 ---tty-stream-chunk-separator
 -# unhandled-rejection › unhandled non-error rejection
 -ok 28 - unhandled-rejection [90m[2m›[22m[39m unhandled non-error rejection
 +ok 28 - unhandled-rejection › unhandled non-error rejection
 ---tty-stream-chunk-separator
 -# Error: Can’t catch me
 not ok 29 - Error: Can’t catch me
   ---
     name: Error
     message: Can’t catch me
     at: 'passes (test-tap/fixture/report/regular/unhandled-rejection.js:4:17)'
   ...
 ---tty-stream-chunk-separator
 -# unhandled-rejection
 not ok 30 - unhandled-rejection
   ---
     message: Non-error object