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`	`}`