@carbonorm/carbonreact 3.3.0 → 3.3.2

package/package.json

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

package/src/hoc/setupTests.tsx

@@ -4,64 +4,67 @@ import {checkAllRequestsComplete, isVerbose} from "@carbonorm/carbonnode";
 import {waitFor} from "@testing-library/react";
 import {validSQL} from "./validSQL";
 
-const origionalWindowLocation = window.location
+export default function ({sqlDirectory = './logs/rest/', logsDirectory = './logs/tests/'}: { sqlDirectory: string, logsDirectory: string }) {
 
-const testName = () => expect.getState().currentTestName?.replaceAll(" ", "_").toLowerCase()
+    const originalWindowLocation = window.location
 
-const validSqlFile = () => './logs/rest/' + testName() + '.json';
+    const testName = () => expect.getState().currentTestName?.replaceAll(" ", "_").toLowerCase()
 
-const logsFile = () => './logs/tests/' + testName() + '.log';
+    const validSqlFile = () => sqlDirectory + testName() + '.json';
 
-/* eslint-disable no-undef */
-expect(document).not.toBeNull();
+    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 superLogger = async (...args) => fs.writeFileSync(
-    logsFile(),
-    '\n' + inspect(args.length === 1 ? args.pop() : args, false, 10, true),
-    {flag: "a+"});
+    const orig = console;
 
-// noinspection CommaExpressionJS
-global.console = {
-    ...console,
-    // use jest.fn() to silence, comment out to leave as it is
-    log: (...args) => (isVerbose && orig.log(...args), superLogger('log', ...args)),
-    error: (...args) => (isVerbose && orig.error(...args), superLogger('error', ...args)),
-    warn: (...args) => (isVerbose && orig.warn(...args), superLogger('warn', ...args)),
-    info: (...args) => (isVerbose && orig.info(...args), superLogger('info', ...args)),
-    debug: (...args) => (isVerbose && orig.debug(...args), superLogger('debug', ...args)),
-    table: (...args) => (isVerbose && orig.table(...args), superLogger('table', ...args)),
-    trace: (...args) => (isVerbose && orig.trace(...args), superLogger((() => {
-        const err = new Error();
-        return err.stack;
-    })())),
-    group: (...args) => (isVerbose && orig.group(...args), superLogger('group', ...args)),
-    groupCollapsed: (...args) => (isVerbose && orig.groupCollapsed(args), superLogger('groupCollapsed', ...args)),
-    groupEnd: () => (isVerbose && orig.groupEnd(), superLogger('groupEnd')),
-};
+    // @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+"});
 
-afterEach(async () => {
+    // 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((() => {
+            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')),
+    };
 
-    await waitFor(async () => {
+    afterEach(async () => {
 
-        expect(checkAllRequestsComplete()).toEqual(true);
+        await waitFor(async () => {
 
-    }, {timeout: 3000, interval: 1000});
+            expect(checkAllRequestsComplete()).toEqual(true);
 
-    // this must be a dynamic import to avoid loading dependencies out of order
-    // await waitForTrailingRequests({testPassed: true, timeout: 12000})
+        }, {timeout: 3000, interval: 1000});
 
-    console.log('After each Test (' + expect.getState().currentTestName + ')', expect.getState());
+        // this must be a dynamic import to avoid loading dependencies out of order
+        // await waitForTrailingRequests({testPassed: true, timeout: 12000})
 
-    // restore `window.location` to the original `jsdom`
-    // `Location` object
-    window.location = origionalWindowLocation
+        console.log('After each Test (' + expect.getState().currentTestName + ')', expect.getState());
 
-    fs.writeFileSync(validSqlFile(), JSON.stringify(validSQL , undefined, 2) ?? '');
+        // restore `window.location` to the original `jsdom`
+        // `Location` object
+        window.location = originalWindowLocation
 
-}, 65000)
+        fs.writeFileSync(validSqlFile(), JSON.stringify(validSQL, undefined, 2) ?? '');
 
+    }, 65000)
 
+
+}

package/src/hoc/validSQL.tsx

@@ -7,4 +7,5 @@ export default function (sql: any) {
 
     validSQL.push({[expect.getState().currentTestName.replaceAll(" ", "_").toLowerCase()]: sql});
 
-}
+}
+

package/src/index.ts

@@ -41,6 +41,7 @@ export { default as setCookies } from "./hoc/setCookies";
 export * from "./hoc/setCookies";
 export { default as setUrl } from "./hoc/setUrl";
 export * from "./hoc/setUrl";
+export { default as setupTests } from "./hoc/setupTests";
 export * from "./hoc/setupTests";
 export { default as updateRestfulObjectArrays } from "./hoc/updateRestfulObjectArrays";
 export * from "./hoc/updateRestfulObjectArrays";