@carbonorm/carbonreact 3.3.3 → 3.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonreact",
-  "version": "3.3.3",
+  "version": "3.3.5",
   "browser": "dist/index.umd.js",
   "module": "dist/index.esm.js",
   "main": "dist/index.cjs.js",

package/src/hoc/setupTests.tsx

@@ -8,41 +8,38 @@ export default function ({sqlDirectory = './logs/rest/', logsDirectory = './logs
 
     const originalWindowLocation = window.location
 
+    const consoleOriginal = console;
+
     const testName = () => expect.getState().currentTestName?.replaceAll(" ", "_").toLowerCase()
 
     const validSqlFile = () => sqlDirectory + testName() + '.json';
 
     const logsFile = () => logsDirectory + testName() + '.log';
 
-    /* eslint-disable no-undef */
     expect(document).not.toBeNull();
 
-
-    const orig = console;
-
     // @link https://stackoverflow.com/questions/13542667/create-directory-when-writing-to-file-in-node-js
     const asyncFileLogging = async (...args) => fs.writeFileSync(
         logsFile(),
         '\n' + inspect(args.length === 1 ? args.pop() : args, false, 10, true),
         {flag: "a+"});
 
-    // noinspection CommaExpressionJS
     global.console = {
         ...console,
         // use jest.fn() to silence, comment out to leave as it is
-        log: (...args) => (isVerbose && orig.log(...args), asyncFileLogging('log', ...args)),
-        error: (...args) => (isVerbose && orig.error(...args), asyncFileLogging('error', ...args)),
-        warn: (...args) => (isVerbose && orig.warn(...args), asyncFileLogging('warn', ...args)),
-        info: (...args) => (isVerbose && orig.info(...args), asyncFileLogging('info', ...args)),
-        debug: (...args) => (isVerbose && orig.debug(...args), asyncFileLogging('debug', ...args)),
-        table: (...args) => (isVerbose && orig.table(...args), asyncFileLogging('table', ...args)),
-        trace: (...args) => (isVerbose && orig.trace(...args), asyncFileLogging((() => {
+        debug: (...args) => (isVerbose && consoleOriginal.debug(...args), asyncFileLogging('debug', ...args)),
+        error: (...args) => (isVerbose && consoleOriginal.error(...args), asyncFileLogging('error', ...args)),
+        group: (...args) => (isVerbose && consoleOriginal.group(...args), asyncFileLogging('group', ...args)),
+        groupCollapsed: (...args) => (isVerbose && consoleOriginal.groupCollapsed(args), asyncFileLogging('groupCollapsed', ...args)),
+        groupEnd: () => (isVerbose && consoleOriginal.groupEnd(), asyncFileLogging('groupEnd')),
+        info: (...args) => (isVerbose && consoleOriginal.info(...args), asyncFileLogging('info', ...args)),
+        log: (...args) => (isVerbose && consoleOriginal.log(...args), asyncFileLogging('log', ...args)),
+        table: (...args) => (isVerbose && consoleOriginal.table(...args), asyncFileLogging('table', ...args)),
+        trace: (...args) => (isVerbose && consoleOriginal.trace(...args), asyncFileLogging((() => {
             const err = new Error();
             return err.stack;
         })())),
-        group: (...args) => (isVerbose && orig.group(...args), asyncFileLogging('group', ...args)),
-        groupCollapsed: (...args) => (isVerbose && orig.groupCollapsed(args), asyncFileLogging('groupCollapsed', ...args)),
-        groupEnd: () => (isVerbose && orig.groupEnd(), asyncFileLogging('groupEnd')),
+        warn: (...args) => (isVerbose && consoleOriginal.warn(...args), asyncFileLogging('warn', ...args)),
     };
 
     afterEach(async () => {
@@ -53,16 +50,15 @@ export default function ({sqlDirectory = './logs/rest/', logsDirectory = './logs
 
         }, {timeout: 3000, interval: 1000});
 
-        // this must be a dynamic import to avoid loading dependencies out of order
-        // await waitForTrailingRequests({testPassed: true, timeout: 12000})
+        const jsonSQL = JSON.stringify(validSQL, undefined, 2) ?? '';
 
-        console.log('After each Test (' + expect.getState().currentTestName + ')', expect.getState());
+        console.log('After each Test (' + expect.getState().currentTestName + ') + (' +jsonSQL+ ')', expect.getState());
 
         // restore `window.location` to the original `jsdom`
         // `Location` object
         window.location = originalWindowLocation
 
-        fs.writeFileSync(validSqlFile(), JSON.stringify(validSQL, undefined, 2) ?? '');
+        fs.writeFileSync(validSqlFile(), jsonSQL);
 
     }, 65000)