sxy-test-runner 1.0.3 → 1.0.6

package/dist/cli/lib/loadTestFile.unitTest.js

@@ -1,24 +1,38 @@
-import { defaultConfig } from './defaultConfig.js';
-import { applyConfigDefaults } from './applyConfigDefaults.js';
-import { loadTestFile } from './loadTestFile.js'; // loadTestFile(config, testFile) ???
+import { loadTestFile } from "./loadTestFile.js";
+import { defaultConfig } from './defaultConfig.js'; // loadTestFile(config, testFile) ???
 
 await mochaDescribe('loadTestFile() function', async function () {
-  await mochaIt('should load a test file, retreiving describes', async function () {
-    const config = defaultConfig;
-    const sampleTestFile = 'unitTesting/sampleTests/1.test.js';
-    const test = await loadTestFile(config, sampleTestFile);
-    await test.describes.length.should.equal(1);
-    await (await test.describes.at(-1)).counter.should.equal(1);
-    await test.describes[0].tests.should.be.a('function'); //test.describes.at(-1).its.at(-1).counter.should.equal(1)
-  });
-  await mochaIt('should correctly load a second test file', async function () {
-    const config = defaultConfig;
-    const sampleTestFile = 'unitTesting/sampleTests/2.test.js';
-    const test = await loadTestFile(config, sampleTestFile);
-    await test.describes.length.should.equal(1);
-    await (await test.describes.at(-1)).counter.should.equal(1);
-    await test.describes[0].tests.should.be.a('function'); //test.describes.at(-1).its.at(-1).counter.should.equal(2)
-  });
+  /*
+      mochaIt('should load a test file, retreiving describes', function() {
+  
+          const config = defaultConfig
+  
+          const sampleTestFile = 'unitTesting/sampleTests/1.test.js'
+  
+          const test = loadTestFile(config, sampleTestFile)
+  
+          test.describes.length.should.equal(1)
+          test.describes.at(-1).counter.should.equal(1)
+          test.describes[0].tests.should.be.a('function')
+          //test.describes.at(-1).its.at(-1).counter.should.equal(1)
+  
+      })
+  
+      mochaIt('should correctly load a second test file', function() {
+  
+          const config = defaultConfig
+  
+          const sampleTestFile = 'unitTesting/sampleTests/2.test.js'
+  
+          const test = loadTestFile(config, sampleTestFile)
+  
+          test.describes.length.should.equal(1)
+          test.describes.at(-1).counter.should.equal(1)
+          test.describes[0].tests.should.be.a('function')
+          //test.describes.at(-1).its.at(-1).counter.should.equal(2)
+  
+      })
+  */
   await mochaIt('should correctly load a file with describes without any its/tests', async function () {
     const config = defaultConfig;
     const sampleTestFile = 'unitTesting/sampleTests/describesWithoutTests.test.js';
@@ -28,24 +42,4 @@ await mochaDescribe('loadTestFile() function', async function () {
     await (await test.describes.at(-1)).counter.should.equal(2);
     await test.describes[0].tests.should.be.a('function'); //test.describes.at(-1).its.at(-1).counter.should.equal(2)
   });
-  await mochaIt('should capture console.log output from a test file, when files are running sequentially', async function () {
-    const config = await applyConfigDefaults({
-      execution: {
-        files: 'sequential'
-      }
-    });
-    const sampleTestFile = 'unitTesting/sampleTests/consoleLog.test.js';
-    const testBlock = await loadTestFile(config, sampleTestFile);
-    await testBlock.consoleLogs.should.deep.equal([['foo'], ['bar']]);
-  });
-  await mochaIt('should capture console.log output from a test file, when files are running sequentially', async function () {
-    const config = await applyConfigDefaults({
-      execution: {
-        files: 'parallel'
-      }
-    });
-    const sampleTestFile = 'unitTesting/sampleTests/consoleLog.test.js';
-    const testBlock = await loadTestFile(config, sampleTestFile);
-    await chaiShould.not.exist(testBlock.consoleLogs);
-  }); // should not log output when running in parallel
 });

package/dist/cli/lib/parseDescribe.js

@@ -0,0 +1,88 @@
+import { timeProfileAsync } from './timeProfier.js';
+import { runTasks } from './runTasks.js';
+import { addExports } from './addExports.js';
+import { debug } from '../../output.js';
+import { runIt } from './runIt.js';
+export async function parseDescribe(config, describe) {
+  return await timeProfileAsync(`parse its from describe ${describe.thing}`, async () => {
+    let itCounter = 1;
+    const its = []; // create functions to pass back
+    // afterDescribe
+
+    let afterDescribeFunc;
+
+    async function afterDescribe(func) {
+      if (typeof func !== 'function') {
+        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
+      }
+
+      afterDescribeFunc = func;
+    } // beforeEachTest
+
+
+    let beforeEachTestFunc;
+
+    async function beforeEachTest(func) {
+      if (typeof func !== 'function') {
+        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
+      }
+
+      beforeEachTestFunc = func;
+    } // afterEachTest
+
+
+    let afterEachTestFunc;
+
+    async function afterEachTest(func) {
+      if (typeof func !== 'function') {
+        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
+      }
+
+      afterEachTestFunc = func;
+    } // it
+
+
+    async function it(should, test) {
+      const thisItCounter = itCounter++;
+      await its.push({
+        counter: thisItCounter,
+        should,
+        test //beforeEachTestExports
+
+      });
+    }
+
+    const test = it;
+    const beforeDescribeExports = {};
+    await configBeforeEachDescribe(config, beforeDescribeExports);
+    const describeParcel = {
+      it,
+      test,
+      afterDescribe,
+      beforeEachTest,
+      afterEachTest
+    };
+    await addExports(describeParcel, beforeDescribeExports);
+    await describe.tests(describeParcel);
+    return {
+      its,
+      beforeDescribeExports,
+      afterDescribeFunc,
+      beforeEachTestFunc,
+      afterEachTestFunc
+    };
+  });
+}
+
+async function configBeforeEachDescribe(config, exports) {
+  if (config.beforeEachDescribe) {
+    const theExports = await runTasks(config.beforeEachDescribe, undefined);
+    await addExports(exports, theExports);
+  }
+}
+
+async function configAfterEachDescribe(config, exports) {
+  if (config.afterEachDescribe) {
+    await runTasks(config.afterEachDescribe, exports);
+  }
+}

package/dist/cli/lib/parseDescribe.unitTest.js

@@ -0,0 +1,17 @@
+import { applyConfigDefaults } from './applyConfigDefaults.js';
+import { loadTestFile } from './loadTestFile.js';
+import { parseDescribe } from './parseDescribe.js';
+const defaultConfig = await applyConfigDefaults({}); // const beforeAfterTestFile = 'unitTesting/runTest/beforeAfter.test.js'
+// const beforeAfterTest = loadTestFile(defaultConfig, beforeAfterTestFile)
+
+await mochaDescribe('runDescribe() function', async function () {
+  await mochaIt('should run an it block that was loaded from a test file', async function () {
+    const sampleTestFile = 'unitTesting/runTest/1.test.js';
+    const sampleTest = await loadTestFile(defaultConfig, sampleTestFile);
+    const sampleDescribe = sampleTest.describes[0];
+    const parsedDescribe = await parseDescribe(defaultConfig, sampleDescribe);
+    await parsedDescribe.should.include.keys(['its', 'beforeDescribeExports', 'afterDescribeFunc', 'beforeEachTestFunc', 'afterEachTestFunc']); //console.log('parsedDescribe', parsedDescribe)
+
+    await parsedDescribe.its[0]['should'].should.equal('1 should equal 1');
+  });
+});

package/dist/cli/lib/runDescribe.js

@@ -1,141 +1,29 @@
-// to be populated with the func from runTestFile.js
-import { createTimeProfiler } from 'sxy-dev-tools';
-import { showTimeProfiling } from '../../config.js';
-import { out, log, debug } from '../../output.js';
-import { shouldCaptureConsoleLog } from './shouldCaptureConsoleLog.js';
-import { overrideConsoleLog } from './overrideConsoleLog.js';
-import { addExports } from './addExports.js';
-import { configBeforeEachDescribe, configAfterEachDescribe } from './configBeforeAfterFuncs.js';
-import { runIt } from './runIt.js';
-const {
-  timeProfileAsync
-} = await createTimeProfiler(showTimeProfiling);
+import { timeProfileAsync } from './timeProfier.js';
+import { parseDescribe } from './parseDescribe.js';
+import { runDescribeRun } from './runDescribeRun.js';
 export async function runDescribe(config, describe) {
   return await timeProfileAsync(`run describe ${describe.thing}`, async () => {
-    // afterDescribe
-    let afterDescribeFunc;
+    const capturingConsoleLog = config.execution.describes === 'sequential'; //// capture console.log output
 
-    async function afterDescribe(func) {
-      if (typeof func !== 'function') {
-        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
-      }
+    let previousConsoleLog;
+    const logs = [];
 
-      afterDescribeFunc = func;
-    } // beforeEachTest
+    if (capturingConsoleLog) {
+      previousConsoleLog = console.log; // eslint-disable-line no-console
 
+      console.log = async (...texts) => await logs.push(texts); // eslint-disable-line no-console
 
-    let beforeEachTestFunc;
+    } ////
 
-    async function beforeEachTest(func) {
-      if (typeof func !== 'function') {
-        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
-      }
 
-      beforeEachTestFunc = func;
-    } // afterEachTest
+    const parsedDescribe = await parseDescribe(config, describe);
+    const describeResult = await runDescribeRun(config, describe, parsedDescribe);
+    describeResult.logs = logs;
 
-
-    let afterEachTestFunc;
-
-    async function afterEachTest(func) {
-      if (typeof func !== 'function') {
-        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
-      }
-
-      afterEachTestFunc = func;
-    }
-
-    let itCounter = 1;
-    const its = []; // create functions to pass back
-    // it
-
-    async function it(should, test) {
-      const thisItCounter = itCounter++;
-      await its.push({
-        counter: thisItCounter,
-        should,
-        test
-      });
-    }
-
-    const test = it;
-    const describeExports = {};
-    await configBeforeEachDescribe(config, describeExports);
-    const describeParcel = {
-      it,
-      test,
-      afterDescribe,
-      beforeEachTest,
-      afterEachTest
-    };
-    await addExports(describeParcel, describeExports); // capture the console.log output if we can
-
-    let originalConsoleLog, replacementConsoleLog;
-
-    if (await shouldCaptureConsoleLog(config, 'describe')) {
-      ({
-        originalConsoleLog,
-        replacementConsoleLog
-      } = await overrideConsoleLog());
-    }
-
-    try {
-      await describe.tests(describeParcel);
-    } catch (e) {
-      const describeErrorResult = {
-        counter: describe.counter,
-        thing: describe.thing,
-        error: e.message,
-        success: false
-      };
-
-      if (await shouldCaptureConsoleLog(config, 'describe')) {
-        console.log = originalConsoleLog; // eslint-disable-line no-console
-
-        describeErrorResult.consoleLogs = replacementConsoleLog.logs;
-      }
-
-      return describeErrorResult;
-    } //!!!!! should this be here, or at the end after its?
-
-
-    let describeConsoleLogs;
-
-    if (await shouldCaptureConsoleLog(config, 'describe')) {
-      console.log = originalConsoleLog; // eslint-disable-line no-console
-
-      describeConsoleLogs = replacementConsoleLog.logs; //!!!!!! This needs to be applied
+    if (capturingConsoleLog) {
+      console.log = previousConsoleLog; // eslint-disable-line no-console
     }
 
-    const itResults = [];
-
-    for (const it of its) {
-      await itResults.push(await runIt(config, it, beforeEachTestFunc, afterEachTestFunc));
-    }
-
-    const itResultsSummary = {
-      total: 0,
-      passes: 0
-    };
-
-    for (const itResult of itResults) {
-      itResultsSummary.total += +(itResult.success !== null);
-      itResultsSummary.passes += +itResult.success;
-    }
-
-    await debug('itResultsSummary', itResultsSummary);
-    const describeResult = {
-      counter: describe.counter,
-      thing: describe.thing,
-      error: false,
-      success: itResultsSummary.total > 0 ? itResultsSummary.passes === itResultsSummary.total : null,
-      itResults,
-      itResultsSummary,
-      consoleLogs: describeConsoleLogs
-    }; // run after 
-
-    if (typeof afterDescribeFunc === 'function') await afterDescribeFunc();
-    await configAfterEachDescribe(config, describeExports);
     return describeResult;
   });
 }

package/dist/cli/lib/runDescribe.old.js

@@ -0,0 +1,115 @@
+import { timeProfileAsync } from './timeProfier.js';
+import { runTasks } from './runTasks.js';
+import { addExports } from './addExports.js';
+import { debug } from '../../output.js';
+import { runIt } from './runIt.js';
+export async function runDescribeOld(config, describe) {
+  return await timeProfileAsync(`run describe ${describe.thing}`, async () => {
+    let itCounter = 1;
+    const its = []; // create functions to pass back
+    // afterDescribe
+
+    let afterDescribeFunc;
+
+    async function afterDescribe(func) {
+      if (typeof func !== 'function') {
+        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
+      }
+
+      afterDescribeFunc = func;
+    } // beforeEachTest
+
+
+    let beforeEachTestFunc;
+
+    async function beforeEachTest(func) {
+      if (typeof func !== 'function') {
+        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
+      }
+
+      beforeEachTestFunc = func;
+    } // afterEachTest
+
+
+    let afterEachTestFunc;
+
+    async function afterEachTest(func) {
+      if (typeof func !== 'function') {
+        throw new Error(`afterDescribe() error, argument passed to afterDescribe() must be a function,` + ` received ${typeof func}`);
+      }
+
+      afterEachTestFunc = func;
+    } // it
+
+
+    async function it(should, test) {
+      const thisItCounter = itCounter++;
+      await its.push({
+        counter: thisItCounter,
+        should,
+        test //beforeEachTestExports
+
+      });
+    }
+
+    const test = it;
+    const describeExports = {};
+    await configBeforeEachDescribe(config, describeExports);
+    const describeParcel = {
+      it,
+      test,
+      afterDescribe,
+      beforeEachTest,
+      afterEachTest
+    };
+    await addExports(describeParcel, describeExports);
+    await describe.tests(describeParcel); //console.log('its', its)
+    // const beforeEachDescribeExports = (config.beforeEachDescribe)
+    //     ? runTasks(config, config.beforeEachDescribe)
+    //     : {}
+    //const thisDescribeCounter = describeCounter++ // assign THEN increment
+    //let itCounter = 1
+
+    const itResults = [];
+
+    for (const it of its) {
+      await itResults.push(await runIt(config, it, beforeEachTestFunc, afterEachTestFunc));
+    }
+
+    const itResultsSummary = {
+      total: 0,
+      passes: 0
+    };
+
+    for (const itResult of itResults) {
+      itResultsSummary.total += +(itResult.success !== null);
+      itResultsSummary.passes += +itResult.success;
+    }
+
+    await debug('itResultsSummary', itResultsSummary);
+    const describeResult = {
+      counter: describe.counter,
+      thing: describe.thing,
+      success: itResultsSummary.total > 0 ? itResultsSummary.passes === itResultsSummary.total : null,
+      itResults,
+      itResultsSummary
+    }; // run after 
+
+    if (typeof afterDescribeFunc === 'function') await afterDescribeFunc();
+    await configAfterEachDescribe(config, describeExports);
+    return describeResult;
+  });
+}
+
+async function configBeforeEachDescribe(config, exports) {
+  if (config.beforeEachDescribe) {
+    const theExports = await runTasks(config.beforeEachDescribe, undefined);
+    await addExports(exports, theExports);
+  }
+}
+
+async function configAfterEachDescribe(config, exports) {
+  if (config.afterEachDescribe) {
+    await runTasks(config.afterEachDescribe, exports);
+  }
+}