testeranto 0.49.0 → 0.49.2

package/src/subPackages/react-dom/jsx/web.ts

@@ -6,25 +6,13 @@ import React, {
 import ReactDom from "react-dom/client";
 
 import { ITTestShape, ITestImplementation, ITestSpecification } from "../../../core";
-
-type Input = [string, (string) => string, any];
-type InitialState = unknown;
-type IWhenShape = any;
-type IThenShape = any;
-type ISelection = IStore;
-
-type Prototype = () => JSX.Element;
-type IStore = {
-  root: HTMLElement,
-  react: HTMLElement,
-};
-type ISubject = {
-  root: HTMLElement
-};
+import {
+  IInput, ISelection, IStore, ISubject, IThenShape, IWhenShape, IState
+} from ".";
 
 export default <ITestShape extends ITTestShape>(
   testImplementations: ITestImplementation<
-    InitialState,
+    IState,
     ISelection,
     IWhenShape,
     IThenShape,
@@ -37,59 +25,55 @@ export default <ITestShape extends ITTestShape>(
     ISelection,
     IThenShape
   >,
-  testInput: Prototype
+  testInput: IInput
 ) => {
   document.addEventListener("DOMContentLoaded", function () {
-    const elem = document.getElementById("root");
-    if (elem) {
-      const TesterantoComponent = function (props) {
+    console.log("DOMContentLoaded");
+    const rootElement = document.getElementById("root");
+    if (rootElement) {
+      const TesterantoComponent = function (innerProps) {
         const myContainer = useRef(null);
-
         useEffect(() => {
           console.log(
-            "This only happens ONCE. It happens AFTER the initial render."
+            "useEffect called"
           );
-          // eslint-disable-next-line react/prop-types
-          props.done(myContainer.current);
+          innerProps.done(myContainer.current);
         }, []);
 
-        return React.createElement('div', { ref: myContainer }, testInput());  //testInput();
+        return React.createElement(
+          'div',
+          { ref: myContainer },
+          testInput()
+        );
       };
 
       Testeranto<
         ITestShape,
-        Prototype,
+        IInput,
         ISubject,
         IStore,
         ISelection,
         IThenShape,
         IWhenShape,
-        InitialState
+        IState
       >(
         testInput,
         testSpecifications,
         testImplementations,
         {
-          beforeAll: async (
-            prototype,
-            artificer
-          ): Promise<ISubject> => {
-            return new Promise((resolve, rej) => {
-              resolve({ root: elem });
-            })
-          },
           beforeEach: async (
-            { root },
+            subject,
             ndx,
             testRsource,
             artificer
           ): Promise<IStore> => {
             return new Promise((resolve, rej) => {
-              ReactDom.createRoot(root).
+              ReactDom.createRoot(rootElement).
                 render(
+                  // ignore this type error
                   React.createElement(
                     TesterantoComponent, {
-                    done: (react) => resolve({ root, react })
+                    done: (reactElement: any) => resolve(reactElement)
                   }, []));
             });
           },
@@ -107,7 +91,6 @@ export default <ITestShape extends ITTestShape>(
             return {};
           },
           afterAll: (store: IStore, artificer) => {
-            // store.page.browser().close();
             return;
           },
         },