system-testing 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-testing",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "System testing with Selenium and browsers.",
   "keywords": [
     "system",

package/src/system-test-browser-helper.js

@@ -1,7 +1,7 @@
 import {digg} from "diggerize"
 import EventEmitter from "events"
 
-import SystemTestCommunicator from "./system-test-communicator"
+import SystemTestCommunicator from "./system-test-communicator.js"
 
 const shared = {}
 

package/src/system-test.js

@@ -7,7 +7,6 @@ import moment from "moment"
 import {prettify} from "htmlfy"
 import SystemTestCommunicator from "./system-test-communicator.js"
 import SystemTestHttpServer from "./system-test-http-server.js"
-import {wait} from "awaitery"
 import {WebSocketServer} from "ws"
 
 class ElementNotFoundError extends Error { }
@@ -26,9 +25,9 @@ export default class SystemTest {
 
     await systemTest.communicator.sendCommand({type: "initialize"})
     await systemTest.visit("/blank")
-    await systemTest.findByTestID("blankText")
 
     try {
+      await systemTest.findByTestID("blankText")
       await callback(systemTest)
     } catch (error) {
       await systemTest.takeScreenshot()
@@ -181,13 +180,11 @@ export default class SystemTest {
       .setCapability("goog:loggingPrefs", {browser: "ALL"})
       .build()
 
-    this.setTimeouts(4000)
+    await this.setTimeouts(10000)
 
     // Web socket server to communicate with browser
     await this.startWebSocketServer()
 
-    // await wait(360000)
-
     // Visit the root page and wait for Expo to be loaded and the app to appear
     await this.driverVisit("/?systemTest=true")
 
@@ -203,6 +200,7 @@ export default class SystemTest {
     // Wait for client to connect
     await this.waitForClientWebSocket()
 
+    await this.setTimeouts(4000)
     this._started = true
   }
 

package/src/use-system-test.js

@@ -1,61 +1,59 @@
 import qs from "qs"
 import SystemTestBrowserHelper from "./system-test-browser-helper"
-import {useCallback, useEffect, useMemo, useState} from "react"
+import {useCallback, useMemo} from "react"
 import useEventEmitter from "@kaspernj/api-maker/build/use-event-emitter.js"
 import {useRouter} from "expo-router"
 
-export default function useSystemTest({onInitialize, ...restArgs} = {}) {
-  const router = useRouter()
-  const shared = useMemo(() => ({}), [])
-  const [enabled, setEnabled] = useState(undefined)
-  const [systemTestBrowserHelper, setSystemTestBrowserHelper] = useState()
-
-  const calculateEnabled = useCallback(() => {
-    const initialUrl = globalThis.location?.href
-    let enabled = false
+const shared = {
+  initialized: false,
+  systemTestBrowserHelper: null
+}
 
-    if (initialUrl) {
-      const queryString = initialUrl.substring(initialUrl.indexOf("?") + 1, initialUrl.length)
-      const queryParams = qs.parse(queryString)
+const isSystemTestEnabled = () => {
+  let enabled = false
+  const initialUrl = globalThis.location?.href
 
-      if (queryParams.systemTest == "true") {
-        if (!shared.systemTestBrowserHelper) {
-          console.log("Spawn SystemTestBrowserHelper")
+  if (initialUrl) {
+    const queryString = initialUrl.substring(initialUrl.indexOf("?") + 1, initialUrl.length)
+    const queryParams = qs.parse(queryString)
 
-          shared.systemTestBrowserHelper = new SystemTestBrowserHelper()
-          shared.systemTestBrowserHelper.enableOnBrowser()
+    if (queryParams.systemTest == "true") {
+      enabled = true
+    }
+  }
 
-          setSystemTestBrowserHelper(shared.systemTestBrowserHelper)
-        }
+  return enabled
+}
 
-        enabled = true
-      }
-    }
+const getSystemTestBrowserHelper = () => {
+  if (!shared.systemTestBrowserHelper) {
+    shared.systemTestBrowserHelper = new SystemTestBrowserHelper()
+    shared.systemTestBrowserHelper.enableOnBrowser()
+  }
 
-    shared.enabled = enabled
-    setEnabled(enabled)
-  }, [])
+  return shared.systemTestBrowserHelper
+}
 
-  const result = useMemo(() => ({
-    enabled,
-    systemTestBrowserHelper: systemTestBrowserHelper
-  }), [enabled, systemTestBrowserHelper])
+export default function useSystemTest({onInitialize, ...restArgs} = {}) {
+  const router = useRouter()
+  const enabled = useMemo(() => isSystemTestEnabled(), [])
+  const systemTestBrowserHelper = enabled ? getSystemTestBrowserHelper() : null
+  const result = useMemo(() => ({enabled, systemTestBrowserHelper}), [enabled, systemTestBrowserHelper])
 
   const onSystemTestBrowserHelperNavigate = useCallback(({path}) => {
-    if (shared.enabled) {
+    if (enabled) {
       router.navigate(path)
     }
-  }, [])
-
-  useEffect(() => {
-    calculateEnabled()
-  }, [])
+  }, [enabled, router])
 
   useEventEmitter(shared.systemTestBrowserHelper?.getEvents(), "navigate", onSystemTestBrowserHelperNavigate)
 
   useMemo(() => {
-    shared.systemTestBrowserHelper?.onInitialize(onInitialize)
-  }, [onInitialize, shared.systemTestBrowserHelper])
+    if (enabled && !shared.initialized) {
+      shared.initialized = true
+      shared.systemTestBrowserHelper?.onInitialize(onInitialize)
+    }
+  }, [enabled, onInitialize, shared.systemTestBrowserHelper])
 
   const restArgsKeys = Object.keys(restArgs)