supertape 6.7.1 → 6.8.0

package/ChangeLog

@@ -1,3 +1,32 @@
+2021.09.24, v6.8.0
+
+fix:
+- (supertape) check that no assertions called after t.end()
+
+feature:
+- (supertape) add support of check assertions count
+- (@supertape/operator-stub) add calledBefore, calledAfter
+- (@supertape/operator-stub) notCalled: add additional check: called with args
+
+
+2021.09.20, v6.7.4
+
+fix:
+- (supertape) line number when tested function throws
+
+
+2021.09.20, v6.7.3
+
+fix:
+- (supertape) test should have ability to override validations, like checkDuplicates
+
+
+2021.09.19, v6.7.2
+
+fix:
+- (supertape) validator: check scope: add support of slash
+
+
 2021.09.18, v6.7.1
 
 fix:

package/README.md

@@ -46,6 +46,8 @@ Options
    -v, --version               output version information and exit
    -f, --format                use a specific output format - default: progress-bar/tap on CI
    -r, --require               require module
+   --check-scopes              check that messages contains scope: 'scope: message'
+   --check-assertions-count    check that assertion count is no more then 1
    --no-check-duplicates       do not check messages for duplicates
 ```
 
@@ -53,7 +55,8 @@ Options
 
 - `SUPERTAPE_TIMEOUT` - timeout for long running processes;
 - `SUPERTAPE_CHECK_DUPLICATES` - toggle check duplicates;
-- `SUPERTAPE_CHECK_SCOPES` - check that test message has a scope: `scope: subject`
+- `SUPERTAPE_CHECK_SCOPES` - check that test message has a scope: `scope: subject`;
+- `SUPERTAPE_CHECK_ASSERTIONS_COUNT` - check that assertion count is no more then 1;
 
 ```js
 test('tape: error', (t) => {

package/help.json

@@ -4,5 +4,6 @@
     "-f, --format               ": "use a specific output format - default: progress-bar/tap on CI",
     "-r, --require              ": "require module",
     "--check-scopes             ": "check that messages contains scope: 'scope: message'",
+    "--check-assertions-count   ": "check that assertion count is no more then 1",
     "--no-check-duplicates      ": "do not check messages for duplicates"
 }

package/lib/cli.js

@@ -33,6 +33,7 @@ const filesCount = fullstore(0);
 const {
     SUPERTAPE_CHECK_DUPLICATES = '1',
     SUPERTAPE_CHECK_SCOPES = '0',
+    SUPERTAPE_CHECK_ASSERTIONS_COUNT = '0',
 } = process.env;
 
 module.exports = async ({argv, cwd, stdout, stderr, exit}) => {
@@ -89,6 +90,7 @@ const yargsOptions = {
         'help',
         'check-duplicates',
         'check-scopes',
+        'check-assertions-count',
     ],
     alias: {
         version: 'v',
@@ -97,12 +99,14 @@ const yargsOptions = {
         require: 'r',
         checkDuplicates: 'd',
         checkScopes: 's',
+        checkAssertionsCount: 'a',
     },
     default: {
         format: 'progress-bar',
         require: [],
         checkDuplicates: SUPERTAPE_CHECK_DUPLICATES !== '0',
         checkScopes: SUPERTAPE_CHECK_SCOPES === '1',
+        checkAssertionsCount: SUPERTAPE_CHECK_ASSERTIONS_COUNT === '1',
     },
 };
 
@@ -148,6 +152,7 @@ async function cli({argv, cwd, stdout, isStop}) {
         format,
         checkDuplicates,
         checkScopes,
+        checkAssertionsCount,
     } = args;
     
     supertape.init({
@@ -157,6 +162,7 @@ async function cli({argv, cwd, stdout, isStop}) {
         isStop,
         checkDuplicates,
         checkScopes,
+        checkAssertionsCount,
     });
     
     supertape.createStream().pipe(stdout);

package/lib/operators.mjs

@@ -14,7 +14,6 @@ const isFn = (a) => typeof a === 'function';
 const isStr = (a) => typeof a === 'string';
 const isObj = (a) => typeof a === 'object';
 
-// backward compatibility or maybe formatters support
 const end = () => {};
 
 const ok = (actual, message = 'should be truthy') => ({
@@ -170,6 +169,21 @@ const initOperator = (runnerState) => (name) => {
         };
     
     return (...a) => {
+        if (name === 'end') {
+            runnerState.isEnded(true);
+            return end;
+        }
+        
+        runnerState.incAssertionsCount();
+        
+        if (runnerState.isEnded()) {
+            return run(
+                'fail',
+                runnerState,
+                operators.fail(`Cannot run assertions after 't.end()' called`),
+            );
+        }
+        
         const testState = fn(...a);
         return run(name, runnerState, testState);
     };
@@ -223,13 +237,15 @@ function run(name, {formatter, count, incCount, incPassed, incFailed}, testState
     });
 }
 
-export const initOperators = ({formatter, count, incCount, incPassed, incFailed, extensions}) => {
+export const initOperators = ({formatter, count, incCount, incPassed, incFailed, incAssertionsCount, isEnded, extensions}) => {
     const operator = initOperator({
         formatter,
         count,
         incCount,
         incPassed,
         incFailed,
+        isEnded,
+        incAssertionsCount,
     });
     
     const extendedOperators = {};
@@ -251,7 +267,7 @@ export const initOperators = ({formatter, count, incCount, incPassed, incFailed,
         comment: comment({formatter}),
         match: operator('match'),
         notMatch: operator('notMatch'),
-        end,
+        end: operator('end'),
         
         ...extendedOperators,
     };

package/lib/run-tests.js

@@ -3,9 +3,8 @@
 const fullstore = require('fullstore');
 const wraptile = require('wraptile');
 const tryToCatch = require('try-to-catch');
-const once = require('once');
-
 const isDebug = require('./is-debug');
+
 const {createValidator} = require('./validator');
 
 const inc = wraptile((store) => store(store() + 1));
@@ -13,10 +12,7 @@ const isOnly = ({only}) => only;
 const isSkip = ({skip}) => skip;
 const notSkip = ({skip}) => !skip;
 
-const getInitOperators = once(async () => {
-    const {initOperators} = await import('./operators.mjs');
-    return initOperators;
-});
+const getInitOperators = async () => await import('./operators.mjs');
 
 const {
     SUPERTAPE_TIMEOUT = 3000,
@@ -64,11 +60,9 @@ async function runTests(tests, {formatter, operators, skiped, isStop}) {
     const count = fullstore(0);
     const failed = fullstore(0);
     const passed = fullstore(0);
-    
     const incCount = inc(count);
     const incFailed = inc(failed);
     const incPassed = inc(passed);
-    
     const total = tests.length;
     
     formatter.emit('start', {
@@ -76,11 +70,12 @@ async function runTests(tests, {formatter, operators, skiped, isStop}) {
     });
     
     const wasStop = fullstore();
+    
     const getValidationMessage = createValidator({
         tests,
     });
     
-    for (const {fn, message, extensions} of tests) {
+    for (const {fn, message, extensions, at, validations} of tests) {
         if (wasStop())
             break;
         
@@ -90,6 +85,7 @@ async function runTests(tests, {formatter, operators, skiped, isStop}) {
         }
         
         await runOneTest({
+            at,
             fn,
             message,
             formatter,
@@ -100,6 +96,7 @@ async function runTests(tests, {formatter, operators, skiped, isStop}) {
             incFailed,
             incPassed,
             getValidationMessage,
+            validations,
             
             extensions: {
                 ...operators,
@@ -123,33 +120,54 @@ async function runTests(tests, {formatter, operators, skiped, isStop}) {
     };
 }
 
-async function runOneTest({message, fn, extensions, formatter, count, total, failed, incCount, incPassed, incFailed, getValidationMessage}) {
+async function runOneTest({message, at, fn, extensions, formatter, count, total, failed, incCount, incPassed, incFailed, getValidationMessage, validations}) {
+    const isReturn = fullstore(false);
+    const assertionsCount = fullstore(0);
+    const isEnded = fullstore(false);
+    const incAssertionsCount = inc(assertionsCount);
+    
     formatter.emit('test', {
         test: message,
     });
     
-    const initOperators = await getInitOperators();
+    const {initOperators} = await getInitOperators();
+    const {checkIfEnded} = validations;
+    
     const t = initOperators({
         formatter,
         count,
         incCount,
         incPassed,
         incFailed,
+        assertionsCount,
+        incAssertionsCount,
+        isEnded,
         extensions,
+        checkIfEnded,
     });
     
-    const [timer, stopTimer] = timeout(SUPERTAPE_TIMEOUT, ['timeout']);
-    
-    const [error] = await Promise.race([
-        tryToCatch(fn, t),
-        timer,
-    ]);
-    
-    stopTimer();
+    if (!isReturn()) {
+        const [timer, stopTimer] = timeout(SUPERTAPE_TIMEOUT, ['timeout']);
+        const [error] = await Promise.race([tryToCatch(fn, t), timer]);
+        stopTimer();
+        isEnded(false);
+        
+        if (error) {
+            t.fail(error, at);
+            t.end();
+            isReturn(true);
+        }
+    }
     
-    if (error) {
-        t.fail(error);
-        t.end();
+    if (!isReturn()) {
+        const [validationMessage, atLine] = getValidationMessage(message, {
+            assertionsCount: assertionsCount(),
+        });
+        
+        if (atLine) {
+            t.fail(validationMessage, atLine);
+            t.end();
+        }
     }
     
     formatter.emit('test:end', {
@@ -158,11 +176,4 @@ async function runOneTest({message, fn, extensions, formatter, count, total, fai
         test: message,
         failed: failed(),
     });
-    
-    const [validationMessage, at] = getValidationMessage(message);
-    
-    if (at) {
-        t.fail(validationMessage, at);
-        t.end();
-    }
 }

package/lib/supertape.js

@@ -35,6 +35,8 @@ const defaultOptions = {
     getOperators,
     isStop: () => false,
     checkDuplicates: true,
+    checkIfEnded: true,
+    checkAssertionsCount: false,
     checkScopes: false,
 };
 
@@ -42,7 +44,7 @@ function _createEmitter({quiet, format, getOperators, isStop}) {
     const tests = [];
     const emitter = new EventEmitter();
     
-    emitter.on('test', (message, fn, {skip, only, extensions, at}) => {
+    emitter.on('test', (message, fn, {skip, only, extensions, at, validations}) => {
         tests.push({
             message,
             fn,
@@ -50,6 +52,7 @@ function _createEmitter({quiet, format, getOperators, isStop}) {
             only,
             extensions,
             at,
+            validations,
         });
     });
     
@@ -110,16 +113,22 @@ function test(message, fn, options = {}) {
         isStop,
         checkDuplicates,
         checkScopes,
+        checkAssertionsCount,
+        checkIfEnded,
     } = {
         ...defaultOptions,
         ...initedOptions,
         ...options,
     };
     
-    setValidations({
+    const validations = {
         checkDuplicates,
         checkScopes,
-    });
+        checkAssertionsCount,
+        checkIfEnded,
+    };
+    
+    setValidations(validations);
     
     const at = getAt();
     
@@ -137,6 +146,7 @@ function test(message, fn, options = {}) {
         only,
         extensions,
         at,
+        validations,
     });
     
     if (run)

package/lib/validator.js

@@ -2,23 +2,25 @@
 
 const once = require('once');
 const StackTracey = require('stacktracey');
-
 const getDuplicatesMessage = ([, a]) => a;
-const getMessage = ({message, at}) => [message, at];
+
+const getMessage = ({message, at, validations}) => [message, at, validations];
+
 const getMessagesList = (tests) => tests.map(getMessage);
 const compareMessage = (a) => ([b]) => a === b;
-
-const SCOPE_DEFINED = /^[\w-\d\s]+:.*/;
+const SCOPE_DEFINED = /^[\w-/\d\s]+:.*/;
 const processedList = new Set();
 
 const validations = {
     checkDuplicates: true,
     checkScopes: false,
+    checkAssertionsCount: true,
 };
 
 const validators = {
     checkDuplicates,
     checkScopes,
+    checkAssertionsCount,
 };
 
 const {
@@ -30,20 +32,20 @@ const {
 const findByMessage = (msg, tests) => {
     const getMessages = once(getMessagesList);
     const filtered = getMessages(tests).filter(compareMessage(msg));
-    
     return filtered;
 };
 
-module.exports.setValidations = ({checkDuplicates, checkScopes}) => {
+module.exports.setValidations = ({checkDuplicates, checkScopes, checkAssertionsCount}) => {
     assign(validations, {
         checkDuplicates,
         checkScopes,
+        checkAssertionsCount,
     });
 };
 
 const isValidationEnabled = (a) => values(a).filter(Boolean).length;
 
-module.exports.createValidator = ({tests}) => (msg) => {
+module.exports.createValidator = ({tests}) => (msg, options) => {
     if (!isValidationEnabled(validations))
         return [];
     
@@ -56,7 +58,7 @@ module.exports.createValidator = ({tests}) => (msg) => {
         if (!filtered.length)
             throw Error('☝️Looks like message cannot be find in tests, this should never happen');
         
-        const [message, at] = validators[name](msg, filtered);
+        const [message, at] = validators[name](msg, filtered, options);
         
         if (at)
             return [message, at];
@@ -66,14 +68,6 @@ module.exports.createValidator = ({tests}) => (msg) => {
 };
 
 module.exports.getAt = () => {
-    const {
-        checkDuplicates,
-        checkScopes,
-    } = validations;
-    
-    if (!checkDuplicates && !checkScopes)
-        return '';
-    
     return getFileName();
 };
 
@@ -92,6 +86,16 @@ function getFileName() {
     return '';
 }
 
+function checkAssertionsCount(msg, filtered, options) {
+    const {assertionsCount} = options;
+    const [, at] = filtered[0];
+    
+    if (assertionsCount > 1)
+        return [`Only one assertion per test allowed, looks like you have more`, at];
+    
+    return [];
+}
+
 function checkScopes(msg, filtered) {
     const [message, at] = filtered[0];
     
@@ -101,17 +105,29 @@ function checkScopes(msg, filtered) {
     return [];
 }
 
+const isEnabled = (tests, name) => {
+    for (const [,, validations] of tests) {
+        if (!validations[name]) {
+            return false;
+        }
+    }
+    
+    return true;
+};
+
 function checkDuplicates(msg, filtered) {
     if (filtered.length < 2)
         return [];
     
+    if (!isEnabled(filtered, 'checkDuplicates'))
+        return [];
+    
     const [first, second] = filtered.map(getDuplicatesMessage);
     
     if (processedList.has(first))
         return [];
     
     processedList.add(first);
-    
     return [`Duplicate ${first}`, second];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supertape",
-  "version": "6.7.1",
+  "version": "6.8.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "tape compatible test runner with superpowers",
   "homepage": "http://github.com/coderaiser/supertape",