@sap-ux/ui5-test-writer 0.7.109 → 0.7.110

package/dist/fiori-elements-opa-writer.js

@@ -12,6 +12,8 @@ const i18n_1 = require("./i18n");
 const project_access_1 = require("@sap-ux/project-access");
 const modelUtils_1 = require("./utils/modelUtils");
 const opaQUnitUtils_1 = require("./utils/opaQUnitUtils");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
+const flpSandboxUtils_1 = require("./utils/flpSandboxUtils");
 /**
  * Generate OPA test files for a Fiori elements for OData V4 application.
  * Note: this can potentially overwrite existing files in the webapp/test folder.
@@ -54,11 +56,7 @@ async function generateOPAFiles(basePath, opaConfig, metadata, fs, log, standalo
             writeJourneyFiles(appFeatures, writeContext, true, true, virtualOPA5Configured);
         }
         else {
-            editor.move((0, node_path_1.join)(testOutDirPath, 'integration', '**'), (0, node_path_1.join)(testOutDirPath, 'integration_old'));
-            await (0, opaQUnitUtils_1.addIntegrationOldToGitignore)(basePath, editor);
-            const htmlTarget = (0, opaQUnitUtils_1.readHtmlTargetFromQUnitJs)(testOutDirPath, editor) ?? config.htmlTarget;
-            const standaloneConfig = { ...config, htmlTarget };
-            const standaloneWriteContext = { ...writeContext, config: standaloneConfig };
+            const standaloneWriteContext = await resolveStandaloneWriteContext(basePath, testOutDirPath, writeContext, editor);
             if (!virtualOPA5Configured) {
                 writeCommonAndPageFiles(standaloneWriteContext, rootCommonTemplateDirPath);
             }
@@ -71,6 +69,57 @@ async function generateOPAFiles(basePath, opaConfig, metadata, fs, log, standalo
     }
     return editor;
 }
+/**
+ * Resolves the write context for standalone mode when no JourneyRunner.js exists yet.
+ * Moves any existing integration folder to integration_old, or adds the int-test script
+ * and resolves the htmlTarget from flpSandbox.html if present.
+ *
+ * @param basePath - the absolute target path of the application
+ * @param testOutDirPath - output test directory (.../webapp/test)
+ * @param writeContext - shared write context to base the resolved context on
+ * @param editor - a reference to a mem-fs editor
+ * @returns a new WriteContext with the resolved htmlTarget
+ */
+async function resolveStandaloneWriteContext(basePath, testOutDirPath, writeContext, editor) {
+    const { config } = writeContext;
+    let htmlTarget = (0, opaQUnitUtils_1.readHtmlTargetFromQUnitJs)(testOutDirPath, editor) ?? config.htmlTarget;
+    if ((0, node_fs_1.existsSync)((0, node_path_1.join)(testOutDirPath, 'integration'))) {
+        editor.move((0, node_path_1.join)(testOutDirPath, 'integration', '**'), (0, node_path_1.join)(testOutDirPath, 'integration_old'));
+        await (0, opaQUnitUtils_1.addIntegrationOldToGitignore)(basePath, editor);
+    }
+    else {
+        const hasIntTestScript = checkScriptInPackageJson(editor, basePath, 'int-test');
+        if (!hasIntTestScript) {
+            const script = (0, fiori_generator_shared_1.getPackageScripts)({ localOnly: false, addTest: true })['int-test'];
+            if (script) {
+                await (0, project_access_1.updatePackageScript)(basePath, 'int-test', script, editor);
+            }
+        }
+        if ((0, node_fs_1.existsSync)((0, node_path_1.join)(testOutDirPath, 'flpSandbox.html'))) {
+            const hashFromFlpSandbox = (0, flpSandboxUtils_1.readHashFromFlpSandbox)((0, node_path_1.join)('test', 'flpSandbox.html'), await (0, project_access_1.getWebappPath)(basePath), editor);
+            if (hashFromFlpSandbox) {
+                htmlTarget = `test/flpSandbox.html#${hashFromFlpSandbox}`;
+            }
+        }
+    }
+    return { ...writeContext, config: { ...config, htmlTarget } };
+}
+/**
+ * Checks whether a script with the given name exists in the package.json.
+ *
+ * @param editor - a reference to a mem-fs editor
+ * @param basePath - the root folder of the app
+ * @param scriptName - the name of the script to check for
+ * @returns true if the script exists, false otherwise
+ */
+function checkScriptInPackageJson(editor, basePath, scriptName) {
+    const packageJsonPath = (0, node_path_1.join)(basePath, project_access_1.FileName.Package);
+    if (!editor.exists(packageJsonPath)) {
+        return false;
+    }
+    const packageJson = editor.readJSON(packageJsonPath);
+    return !!packageJson.scripts?.[scriptName];
+}
 /**
  * Reads the manifest for an app.
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/ui5-test-writer",
   "description": "SAP UI5 tests writer",
-  "version": "0.7.109",
+  "version": "0.7.110",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -29,6 +29,7 @@
     "@sap-ux/annotation-converter": "0.10.21",
     "@sap-ux/ui5-application-writer": "1.8.7",
     "@sap-ux/logger": "0.8.5",
+    "@sap-ux/fiori-generator-shared": "0.13.104",
     "@sap-ux/project-access": "1.36.2"
   },
   "devDependencies": {

package/templates/v4/integration/ListReportJourney.js

@@ -39,6 +39,7 @@ sap.ui.define([
         });
 <%_ } -%>
 
+<%_ if ((toolBarActions && toolBarActions.length > 0 ) || (tableColumns && Object.keys(tableColumns).length > 0)) { -%>
         opaTest("Check table columns and actions", function (Given, When, Then) {
             <%_ if (toolBarActions && toolBarActions.length > 0) { -%>
             <%_ if (createButton.visible && !isALP) { _%>
@@ -57,9 +58,10 @@ sap.ui.define([
             <%_ }); -%>
             <%_ } -%>
             <%_ if (tableColumns && Object.keys(tableColumns).length > 0) { -%>
-            Then.onThe<%- startLR %>.onTable().iCheckColumns(<%- Object.keys(tableColumns).length %>, <%- JSON.stringify(tableColumns) %>);
+            Then.onThe<%- startLR %>.onTable().iCheckColumns(undefined, <%- JSON.stringify(tableColumns) %>);
             <%_ } %>
         });
+<%_ } %>
 
 <% if (startLR) { %>
         opaTest("Navigate to ObjectPage", function (Given, When, Then) {