fixup! fixup! wip fix tests

avajs · Oct 22, 2023 · 6d31fea · 6d31fea
1 parent 5f1cb3b
commit 6d31fea
Show file tree

Hide file tree

Showing 15 changed files with 106 additions and 89 deletions.
diff --git a/lib/assert.js b/lib/assert.js
@@ -448,7 +448,12 @@ export class Assertions {
 		this.throwsAsync = withSkip(async (...args) => {
 			let [thrower, expectations, message] = args;
 
-			assertMessage(message, 't.throwsAsync()');
+			try {
+				assertMessage(message, 't.throwsAsync()');
+			} catch (error) {
+				Promise.resolve(thrower).catch(noop);
+				throw error;
+			}
 
 			if (typeof thrower !== 'function' && !isPromise(thrower)) {
 				throw fail(new AssertionError('`t.throwsAsync()` must be called with a function or promise', {
@@ -460,6 +465,7 @@ export class Assertions {
 			try {
 				expectations = validateExpectations('t.throwsAsync()', expectations, args.length, experiments);
 			} catch (error) {
+				Promise.resolve(thrower).catch(noop);
 				throw fail(error);
 			}
 
@@ -468,7 +474,7 @@ export class Assertions {
 				const assertionStack = getAssertionStack();
 				// Handle "promise like" objects by casting to a real Promise.
 				const intermediate = Promise.resolve(promise).then(value => {
-					throw fail(new AssertionError(message, {
+					throw failPending(new AssertionError(message, {
 						assertion: 't.throwsAsync()',
 						assertionStack,
 						formattedDetails: [formatWithLabel(`${wasReturned ? 'Returned promise' : 'Promise'} resolved with:`, value)],
@@ -548,7 +554,12 @@ export class Assertions {
 		});
 
 		this.notThrowsAsync = withSkip(async (nonThrower, message) => {
-			assertMessage(message, 't.notThrowsAsync()');
+			try {
+				assertMessage(message, 't.notThrowsAsync()');
+			} catch (error) {
+				Promise.resolve(nonThrower).catch(noop);
+				throw error;
+			}
 
 			if (typeof nonThrower !== 'function' && !isPromise(nonThrower)) {
 				throw fail(new AssertionError('`t.notThrowsAsync()` must be called with a function or promise', {

diff --git a/lib/test.js b/lib/test.js
@@ -45,10 +45,10 @@ class ExecutionContext extends Assertions {
 				test.addPendingAssertion(promise);
 			},
 			fail(error) {
-				test.addFailedAssertion(error);
+				return test.addFailedAssertion(error);
 			},
 			failPending(error) {
-				test.failPendingAssertion(error);
+				return test.failPendingAssertion(error);
 			},
 			skip() {
 				test.countPassedAssertion();
@@ -321,7 +321,7 @@ export default class Test {
 		this.logs.push(text);
 	}
 
-	addPendingAssertion(promise) {
+	async addPendingAssertion(promise) {
 		if (this.finishing) {
 			this.saveFirstError(new Error('Assertion started, but test has already finished'));
 		}
@@ -334,10 +334,14 @@ export default class Test {
 		this.pendingAssertionCount++;
 		this.refreshTimeout();
 
-		promise.finally(() => {
+		try {
+			await promise;
+		} catch {
+			// Ignore errors.
+		} finally {
 			this.pendingAssertionCount--;
 			this.refreshTimeout();
-		});
+		}
 	}
 
 	addFailedAssertion(error) {
@@ -530,7 +534,7 @@ export default class Test {
 		const [syncOk, retval] = this.callFn();
 		if (!syncOk) {
 			if (this.testFailure !== null && retval === this.testFailure) {
-				return;
+				return this.finish();
 			}
 
 			if (isExternalAssertError(retval)) {

diff --git a/test-tap/fixture/report/regular/traces-in-t-throws.cjs b/test-tap/fixture/report/regular/traces-in-t-throws.cjs
@@ -16,12 +16,14 @@ test('notThrows', t => {
 	t.notThrows(() => throwError());
 });
 
-test('notThrowsAsync', t => {
-	t.notThrowsAsync(() => throwError());
+test('notThrowsAsync', async t => {
+	await t.notThrowsAsync(() => throwError());
 });
 
-test('throwsAsync', t => {
-	t.throwsAsync(() => throwError(), {instanceOf: TypeError});
+test('throwsAsync', async t => {
+	await t.throwsAsync(() => throwError(), {instanceOf: TypeError});
 });
 
-test('throwsAsync different error', t => t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError}));
+test('throwsAsync different error', async t => {
+	await t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError});
+});
diff --git a/test-tap/reporters/default.regular.v16.log b/test-tap/reporters/default.regular.v16.log
@@ -289,9 +289,9 @@
 
   [90mtraces-in-t-throws.cjs:20[39m
 
-   [90m19:[39m test('notThrowsAsync', t => {          
-  [41m[1m 20:   t.notThrowsAsync(() => throwError());[22m[49m
-   [90m21:[39m });                                    
+   [90m19:[39m test('notThrowsAsync', async t => {          
+  [41m[1m 20:   await t.notThrowsAsync(() => throwError());[22m[49m
+   [90m21:[39m });                                          
 
   Function threw:
 
@@ -300,18 +300,18 @@
   [90m}[39m
 
   [90m› throwError (test-tap/fixture/report/regular/traces-in-t-throws.cjs:4:8)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:25[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:4[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:31[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:10[39m
 
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throwsAsync[22m
 
   [90mtraces-in-t-throws.cjs:24[39m
 
-   [90m23:[39m test('throwsAsync', t => {                                   
-  [41m[1m 24:   t.throwsAsync(() => throwError(), {instanceOf: TypeError});[22m[49m
-   [90m25:[39m });                                                          
+   [90m23:[39m test('throwsAsync', async t => {                                   
+  [41m[1m 24:   await t.throwsAsync(() => throwError(), {instanceOf: TypeError});[22m[49m
+   [90m25:[39m });                                                                
 
   Function threw synchronously. Use `t.throws()` instead:
 
@@ -320,18 +320,18 @@
   [90m}[39m
 
   [90m› throwError (test-tap/fixture/report/regular/traces-in-t-throws.cjs:4:8)[39m
-  [90m› t.throwsAsync.instanceOf (test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:22)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:4[39m
+  [90m› t.throwsAsync.instanceOf (test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:28)[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:10[39m
 
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throwsAsync different error[22m
 
-  [90mtraces-in-t-throws.cjs:27[39m
+  [90mtraces-in-t-throws.cjs:28[39m
 
-   [90m26:[39m                                                                                                         
-  [41m[1m 27: test('throwsAsync different error', t => t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError}));[22m[49m
-   [90m28:[39m                                                                                                         
+   [90m27:[39m test('throwsAsync different error', async t => {                      
+  [41m[1m 28:   await t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError});[22m[49m
+   [90m29:[39m });                                                                   
 
   Returned promise rejected with unexpected exception:
 
@@ -344,7 +344,7 @@
   [35mFunction[39m [34mTypeError[39m [90m{[39m[90m}[39m
 
   [90m› returnRejectedPromise (test-tap/fixture/report/regular/traces-in-t-throws.cjs:8:24)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:27:44[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:28:10[39m
 
   [90m─[39m
 

diff --git a/test-tap/reporters/default.regular.v18.log b/test-tap/reporters/default.regular.v18.log
@@ -289,9 +289,9 @@
 
   [90mtraces-in-t-throws.cjs:20[39m
 
-   [90m19:[39m test('notThrowsAsync', t => {          
-  [41m[1m 20:   t.notThrowsAsync(() => throwError());[22m[49m
-   [90m21:[39m });                                    
+   [90m19:[39m test('notThrowsAsync', async t => {          
+  [41m[1m 20:   await t.notThrowsAsync(() => throwError());[22m[49m
+   [90m21:[39m });                                          
 
   Function threw:
 
@@ -300,18 +300,18 @@
   [90m}[39m
 
   [90m› throwError (test-tap/fixture/report/regular/traces-in-t-throws.cjs:4:8)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:25[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:4[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:31[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:10[39m
 
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throwsAsync[22m
 
   [90mtraces-in-t-throws.cjs:24[39m
 
-   [90m23:[39m test('throwsAsync', t => {                                   
-  [41m[1m 24:   t.throwsAsync(() => throwError(), {instanceOf: TypeError});[22m[49m
-   [90m25:[39m });                                                          
+   [90m23:[39m test('throwsAsync', async t => {                                   
+  [41m[1m 24:   await t.throwsAsync(() => throwError(), {instanceOf: TypeError});[22m[49m
+   [90m25:[39m });                                                                
 
   Function threw synchronously. Use `t.throws()` instead:
 
@@ -320,18 +320,18 @@
   [90m}[39m
 
   [90m› throwError (test-tap/fixture/report/regular/traces-in-t-throws.cjs:4:8)[39m
-  [90m› t.throwsAsync.instanceOf (test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:22)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:4[39m
+  [90m› t.throwsAsync.instanceOf (test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:28)[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:10[39m
 
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throwsAsync different error[22m
 
-  [90mtraces-in-t-throws.cjs:27[39m
+  [90mtraces-in-t-throws.cjs:28[39m
 
-   [90m26:[39m                                                                                                         
-  [41m[1m 27: test('throwsAsync different error', t => t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError}));[22m[49m
-   [90m28:[39m                                                                                                         
+   [90m27:[39m test('throwsAsync different error', async t => {                      
+  [41m[1m 28:   await t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError});[22m[49m
+   [90m29:[39m });                                                                   
 
   Returned promise rejected with unexpected exception:
 
@@ -344,7 +344,7 @@
   [35mFunction[39m [34mTypeError[39m [90m{[39m[90m}[39m
 
   [90m› returnRejectedPromise (test-tap/fixture/report/regular/traces-in-t-throws.cjs:8:24)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:27:44[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:28:10[39m
 
   [90m─[39m
 

diff --git a/test-tap/reporters/default.regular.v20.log b/test-tap/reporters/default.regular.v20.log
@@ -289,9 +289,9 @@
 
   [90mtraces-in-t-throws.cjs:20[39m
 
-   [90m19:[39m test('notThrowsAsync', t => {          
-  [41m[1m 20:   t.notThrowsAsync(() => throwError());[22m[49m
-   [90m21:[39m });                                    
+   [90m19:[39m test('notThrowsAsync', async t => {          
+  [41m[1m 20:   await t.notThrowsAsync(() => throwError());[22m[49m
+   [90m21:[39m });                                          
 
   Function threw:
 
@@ -300,18 +300,18 @@
   [90m}[39m
 
   [90m› throwError (test-tap/fixture/report/regular/traces-in-t-throws.cjs:4:8)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:25[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:4[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:31[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:20:10[39m
 
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throwsAsync[22m
 
   [90mtraces-in-t-throws.cjs:24[39m
 
-   [90m23:[39m test('throwsAsync', t => {                                   
-  [41m[1m 24:   t.throwsAsync(() => throwError(), {instanceOf: TypeError});[22m[49m
-   [90m25:[39m });                                                          
+   [90m23:[39m test('throwsAsync', async t => {                                   
+  [41m[1m 24:   await t.throwsAsync(() => throwError(), {instanceOf: TypeError});[22m[49m
+   [90m25:[39m });                                                                
 
   Function threw synchronously. Use `t.throws()` instead:
 
@@ -320,18 +320,18 @@
   [90m}[39m
 
   [90m› throwError (test-tap/fixture/report/regular/traces-in-t-throws.cjs:4:8)[39m
-  [90m› t.throwsAsync.instanceOf (test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:22)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:4[39m
+  [90m› t.throwsAsync.instanceOf (test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:28)[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:24:10[39m
 
 
 
   [1mtraces-in-t-throws [90m[2m›[22m[1m[39m throwsAsync different error[22m
 
-  [90mtraces-in-t-throws.cjs:27[39m
+  [90mtraces-in-t-throws.cjs:28[39m
 
-   [90m26:[39m                                                                                                         
-  [41m[1m 27: test('throwsAsync different error', t => t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError}));[22m[49m
-   [90m28:[39m                                                                                                         
+   [90m27:[39m test('throwsAsync different error', async t => {                      
+  [41m[1m 28:   await t.throwsAsync(returnRejectedPromise, {instanceOf: TypeError});[22m[49m
+   [90m29:[39m });                                                                   
 
   Returned promise rejected with unexpected exception:
 
@@ -344,7 +344,7 @@
   [35mFunction[39m [34mTypeError[39m [90m{[39m[90m}[39m
 
   [90m› returnRejectedPromise (test-tap/fixture/report/regular/traces-in-t-throws.cjs:8:24)[39m
-  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:27:44[39m
+  [90m› test-tap/fixture/report/regular/traces-in-t-throws.cjs:28:10[39m
 
   [90m─[39m
 

diff --git a/test-tap/reporters/tap.failfast.v16.log b/test-tap/reporters/tap.failfast.v16.log
@@ -5,7 +5,7 @@ not ok 1 - a › fails
     name: AssertionError
     assertion: t.fail()
     message: Test failed via `t.fail()`
-    at: 'ExecutionContext.fail (/lib/assert.js:285:9)'
+    at: 'ExecutionContext.fail (/lib/assert.js:278:15)'
   ...
 ---tty-stream-chunk-separator
 

diff --git a/test-tap/reporters/tap.failfast.v18.log b/test-tap/reporters/tap.failfast.v18.log
@@ -5,7 +5,7 @@ not ok 1 - a › fails
     name: AssertionError
     assertion: t.fail()
     message: Test failed via `t.fail()`
-    at: 'ExecutionContext.fail (/lib/assert.js:285:9)'
+    at: 'ExecutionContext.fail (/lib/assert.js:278:15)'
   ...
 ---tty-stream-chunk-separator
 

diff --git a/test-tap/reporters/tap.failfast.v20.log b/test-tap/reporters/tap.failfast.v20.log
@@ -5,7 +5,7 @@ not ok 1 - a › fails
     name: AssertionError
     assertion: t.fail()
     message: Test failed via `t.fail()`
-    at: 'ExecutionContext.fail (/lib/assert.js:285:9)'
+    at: 'ExecutionContext.fail (/lib/assert.js:278:15)'
   ...
 ---tty-stream-chunk-separator
 

diff --git a/test-tap/reporters/tap.failfast2.v16.log b/test-tap/reporters/tap.failfast2.v16.log
@@ -5,7 +5,7 @@ not ok 1 - a › fails
     name: AssertionError
     assertion: t.fail()
     message: Test failed via `t.fail()`
-    at: 'ExecutionContext.fail (/lib/assert.js:285:9)'
+    at: 'ExecutionContext.fail (/lib/assert.js:278:15)'
   ...
 ---tty-stream-chunk-separator
 # 1 test remaining in a.cjs

diff --git a/test-tap/reporters/tap.failfast2.v18.log b/test-tap/reporters/tap.failfast2.v18.log
@@ -5,7 +5,7 @@ not ok 1 - a › fails
     name: AssertionError
     assertion: t.fail()
     message: Test failed via `t.fail()`
-    at: 'ExecutionContext.fail (/lib/assert.js:285:9)'
+    at: 'ExecutionContext.fail (/lib/assert.js:278:15)'
   ...
 ---tty-stream-chunk-separator
 # 1 test remaining in a.cjs

diff --git a/test-tap/reporters/tap.failfast2.v20.log b/test-tap/reporters/tap.failfast2.v20.log
@@ -5,7 +5,7 @@ not ok 1 - a › fails
     name: AssertionError
     assertion: t.fail()
     message: Test failed via `t.fail()`
-    at: 'ExecutionContext.fail (/lib/assert.js:285:9)'
+    at: 'ExecutionContext.fail (/lib/assert.js:278:15)'
   ...
 ---tty-stream-chunk-separator
 # 1 test remaining in a.cjs