fix: FE testLibrary initialization (#286)

load the required resources for the testlib only when the testlib is specifically initialized hopefully aids in resolving #276
ui5-community · Jun 21, 2022 · d5fddee · d5fddee
1 parent 2aad7ea
commit d5fddee
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/client-side-js/injectUI5.js b/client-side-js/injectUI5.js
@@ -61,17 +61,7 @@ async function clientSide_injectUI5(config, waitForUI5Timeout) {
                 // known side effect this call triggers the back to node scope, the other sap.ui.require continue to run in background in browser scope
                 done(true)
             })
-            // see also /client-side-js/testLibrary.js
-            sap.ui.require(
-                ["sap/fe/test/ListReport", "sap/fe/test/ObjectPage", "sap/fe/test/Shell"],
-                (ListReport, ObjectPage, Shell) => {
-                    window.fe_bridge.ListReport = ListReport
-                    window.fe_bridge.ObjectPage = ObjectPage
-                    window.fe_bridge.Shell = Shell
-                    // logs for the FE Testlib responses
-                    window.fe_bridge.Log = []
-                }
-            )
+
             // make sure the resources are required
             // TODO: "sap/ui/test/matchers/Sibling",
             sap.ui.require(

diff --git a/client-side-js/testLibrary.js b/client-side-js/testLibrary.js
@@ -88,8 +88,25 @@ async function addToQueue(type, target, aMethods) {
     )
 }
 
+async function loadFELibraries() {
+    return await browser.executeAsync((done) => {
+        sap.ui.require(
+            ["sap/fe/test/ListReport", "sap/fe/test/ObjectPage", "sap/fe/test/Shell"],
+            (ListReport, ObjectPage, Shell) => {
+                window.fe_bridge.ListReport = ListReport
+                window.fe_bridge.ObjectPage = ObjectPage
+                window.fe_bridge.Shell = Shell
+                // logs for the FE Testlib responses
+                window.fe_bridge.Log = []
+                done()
+            }
+        )
+    })
+}
+
 module.exports = {
     emptyQueue,
     initOPA,
-    addToQueue
+    addToQueue,
+    loadFELibraries
 }
diff --git a/src/lib/wdi5-fe.ts b/src/lib/wdi5-fe.ts
@@ -1,4 +1,4 @@
-import { initOPA, addToQueue, emptyQueue } from "../../client-side-js/testLibrary"
+import { initOPA, addToQueue, emptyQueue, loadFELibraries } from "../../client-side-js/testLibrary"
 import { Logger as _Logger } from "./Logger"
 const Logger = _Logger.getInstance()
 
@@ -25,6 +25,7 @@ function createProxy(myObj: any, type: string, methodCalls: any[], pageKeys: str
 export class WDI5FE {
     constructor(private appConfig: any) {}
     static async initialize(appConfig) {
+        await loadFELibraries()
         await initOPA(appConfig)
         return new WDI5FE(appConfig)
     }