system-testing 1.0.22 → 1.0.23

package/package.json

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

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

@@ -179,6 +179,8 @@ export default class SystemTestBrowserHelper {
       return {result: "initialized"}
     } else if (data.type == "visit") {
       this.events.emit("navigate", {path: data.path})
+    } else if (data.type == "dismissTo") {
+      this.events.emit("dismissTo", {path: data.path})
     } else {
       throw new Error(`Unknown command type for SystemTestBrowserHelper: ${data.type}`)
     }

package/src/system-test.js

@@ -15,6 +15,8 @@ import {WebSocketServer} from "ws"
 class ElementNotFoundError extends Error { }
 
 export default class SystemTest {
+  static rootPath = "/blank?systemTest=true"
+
   /**
    * Gets the current system test instance
    *
@@ -38,7 +40,7 @@ export default class SystemTest {
     const systemTest = this.current()
 
     await systemTest.communicator.sendCommand({type: "initialize"})
-    await systemTest.visit("/blank")
+    await systemTest.dismissTo(SystemTest.rootPath)
 
     try {
       await systemTest.findByTestID("blankText", {useBaseSelector: false})
@@ -402,7 +404,7 @@ export default class SystemTest {
     await this.startWebSocketServer()
 
     // Visit the root page and wait for Expo to be loaded and the app to appear
-    await this.driverVisit("/?systemTest=true")
+    await this.driverVisit(SystemTest.rootPath)
 
     try {
       await this.find("body > #root", {useBaseSelector: false})
@@ -614,4 +616,13 @@ export default class SystemTest {
   async visit(path) {
     await this.communicator.sendCommand({type: "visit", path})
   }
+
+  /**
+   * Dismisses to a path in the browser
+   *
+   * @param {string} path
+   */
+  async dismissTo(path) {
+    await this.communicator.sendCommand({type: "dismissTo", path})
+  }
 }

package/src/use-system-test.js

@@ -49,12 +49,31 @@ export default function useSystemTest({onInitialize, ...restArgs} = {}) {
   const enabled = useMemo(() => isSystemTestEnabled(), [])
   const systemTestBrowserHelper = enabled ? getSystemTestBrowserHelper() : null
   const result = useMemo(() => ({enabled, systemTestBrowserHelper}), [enabled, systemTestBrowserHelper])
+  const instanceShared = useMemo(() => ({}), [])
 
+  instanceShared.enabled = enabled
+  instanceShared.router = router
+
+  // Resets navigation when instructed by the system test browser helper
+  const onSystemTestBrowserHelperDismissTo = useCallback(({path}) => {
+    if (instanceShared.enabled) {
+      try {
+        instanceShared.router.dismissTo(path)
+      } catch (error) {
+        console.error(`Failed to dismiss to path "${path}": ${error.message}`)
+      }
+    }
+  }, [])
+
+  useEventEmitter(shared.systemTestBrowserHelper?.getEvents(), "dismissTo", onSystemTestBrowserHelperDismissTo)
+
+
+  // Navigates when instructed by the system test browser helper and keeping history of screens
   const onSystemTestBrowserHelperNavigate = useCallback(({path}) => {
-    if (enabled) {
-      router.navigate(path)
+    if (instanceShared.enabled) {
+      instanceShared.router.navigate(path)
     }
-  }, [enabled, router])
+  }, [])
 
   useEventEmitter(shared.systemTestBrowserHelper?.getEvents(), "navigate", onSystemTestBrowserHelperNavigate)