[Breaking] if a test callback returns a rejected thenable, fail the t…

…est. Also, implicitly call `.end()` if not already called when a Promise is returned, because the promise itself marks the end of the test.
tape-testing · Jun 24, 2019 · f248610 · f248610
1 parent 8d3f03a
commit f248610
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 40 deletions.
diff --git a/lib/test.js b/lib/test.js
@@ -97,15 +97,18 @@ Test.prototype.run = function () {
     if (
         typeof Promise === 'function' &&
         callbackReturn &&
-        typeof callbackReturn.then === 'function' &&
-        typeof callbackReturn.catch === 'function'
+        typeof callbackReturn.then === 'function'
     ) {
-        callbackReturn.catch(function onError(err) {
-            nextTick(function rethrowError() {
-                throw err
-            })
-        })
-        return
+        var self = this;
+        Promise.resolve(callbackReturn).then(function onResolve() {
+            if (!self.calledEnd) {
+                self.end();
+            }
+        }).catch(function onError(err) {
+            self.fail(err);
+            self.end();
+        });
+        return;
     }
 
     this.emit('run');

diff --git a/test/async-await.js b/test/async-await.js
@@ -128,11 +128,10 @@ tap.test('async5', function (t) {
             'ok 4 after request',
             'ok 5 should be equal',
             'ok 6 should be equal',
-            'ok 7 undefined',
             '',
-            '1..7',
-            '# tests 7',
-            '# pass  7',
+            '1..6',
+            '# tests 6',
+            '# pass  6',
             '',
             '# ok'
         ].join('\n') + '\n\n');
@@ -190,7 +189,20 @@ tap.test('async-error', function (t) {
             'TAP version 13',
             '# async-error',
             'ok 1 before throw',
-            ''
+            'not ok 2 Error: oopsie',
+            '  ---',
+            '    operator: fail',
+            '    stack: |-',
+            '      Error: Error: oopsie',
+            '          [... stack stripped ...]',
+            '  ...',
+            '',
+            '1..2',
+            '# tests 2',
+            '# pass  1',
+            '# fail  1',
+            '',
+            '',
         ].join('\n'));
         t.same(r.exitCode, 1);
 
@@ -203,18 +215,7 @@ tap.test('async-error', function (t) {
         });
         stderr = lines.join('\n');
 
-        t.same(stripFullStack(stderr), [
-            '$TAPE/lib/test.js:106',
-            '                throw err',
-            '                ^',
-            '',
-            'Error: oopsie',
-            '    at Test.myTest ($TEST/async-await/async-error.js:$LINE:$COL)',
-            '    at Test.bound [as _cb] ($TAPE/lib/test.js:$LINE:$COL)',
-            '    at Test.run ($TAPE/lib/test.js:$LINE:$COL)',
-            '    at Test.bound [as run] ($TAPE/lib/test.js:$LINE:$COL)',
-            ''
-        ].join('\n'));
+        t.same(stderr, '');
         t.end();
     });
 });
diff --git a/test/async-await/async-error.js b/test/async-await/async-error.js
@@ -4,5 +4,4 @@ test('async-error', async function myTest(t) {
     t.ok(true, 'before throw');
     throw new Error('oopsie');
     t.ok(true, 'after throw');
-    t.end();
 });
diff --git a/test/async-await/async1.js b/test/async-await/async1.js
@@ -7,9 +7,7 @@ test('async1', async function myTest(t) {
             setTimeout(resolve, 10);
         });
         t.ok(true, 'after await');
-        t.end();
     } catch (err) {
         t.ifError(err);
-        t.end();
     }
 });
diff --git a/test/async-await/async2.js b/test/async-await/async2.js
@@ -7,9 +7,7 @@ test('async2', async function myTest(t) {
             setTimeout(resolve, 10);
         });
         t.ok(false, 'after await');
-        t.end();
     } catch (err) {
         t.ifError(err);
-        t.end();
     }
 });
diff --git a/test/async-await/async3.js b/test/async-await/async3.js
@@ -6,5 +6,4 @@ test('async3', async function myTest(t) {
         setTimeout(resolve, 10);
     });
     t.ok(true, 'after await');
-    t.end();
 });
diff --git a/test/async-await/async4.js b/test/async-await/async4.js
@@ -9,9 +9,7 @@ test('async4', async function myTest(t) {
             }, 10);
         });
         t.ok(true, 'after await');
-        t.end();
     } catch (err) {
         t.ifError(err);
-        t.end();
     }
 });
diff --git a/test/async-await/async5.js b/test/async-await/async5.js
@@ -42,14 +42,16 @@ test('async5', async function myTest(t) {
         res.resume();
         t.equal(res.statusCode, 200);
 
-        setTimeout(function () {
-            t.equal(mockDb.state, 'new');
+        await new Promise(function (resolve, reject) {
+            setTimeout(function () {
+                t.equal(mockDb.state, 'new');
 
-            server.close(function (err) {
-                t.ifError(err);
-                t.end();
-            });
-        }, 50);
+                server.close(function (err) {
+                    if (err) { reject(err); }
+                    else { resolve(); }
+                });
+            }, 50);
+        });
     } catch (err) {
         t.ifError(err);
         t.end();