@sap-ux/ui5-test-writer 0.7.89 → 0.7.91

package/dist/utils/modelUtils.d.ts

@@ -1,33 +1,84 @@
 import type { Editor } from 'mem-fs-editor';
 import type { Logger } from '@sap-ux/logger';
+import type { PageWithModelV4 } from '@sap/ux-specification/dist/types/src/parser/application';
 import type { TreeAggregation, TreeAggregations, TreeModel, ApplicationModel } from '@sap/ux-specification/dist/types/src/parser';
-import type { FeatureData } from '../types';
+import type { AppFeatures, FPMFeatures } from '../types';
 export interface AggregationItem extends TreeAggregation {
     description: string;
+    schema: {
+        keys: {
+            name: string;
+            value: string;
+        }[];
+    };
+}
+export interface FieldItem extends AggregationItem {
+    name: string;
+}
+export interface SectionItem extends AggregationItem {
+    title?: string;
+    custom?: boolean;
+    name?: string;
+    schema: {
+        keys: {
+            name: string;
+            value: string;
+        }[];
+        dataType?: string;
+    };
+}
+export interface HeaderSectionItem extends SectionItem {
+    properties: {
+        stashed: {
+            freeText: string | boolean;
+        };
+    };
+}
+export interface PageWithModelV4WithProperties extends PageWithModelV4 {
+    routePattern?: string;
 }
 /**
- * Gets feature data from the application model using ux-specification.
+ * Gets app features from the application model using ux-specification.
  *
  * @param basePath - the absolute target path where the application will be generated
  * @param fs - optional mem-fs editor instance
  * @param log - optional logger instance
+ * @param metadata - optional metadata for the OPA test generation
  * @returns feature data extracted from the application model
  */
-export declare function getFeatureData(basePath: string, fs?: Editor, log?: Logger): Promise<FeatureData>;
+export declare function getAppFeatures(basePath: string, fs?: Editor, log?: Logger, metadata?: string): Promise<AppFeatures>;
 /**
- * Retrieves all List Report definitions from the given application model.
+ * Retrieves table column data from the page model using ux-specification.
+ *
+ * @param pageModel - the tree model containing table column definitions
+ * @param log - optional logger instance
+ * @returns - a map of table columns
+ */
+export declare function getTableColumnData(pageModel: TreeModel, log?: Logger): Record<string, Record<string, string | number | boolean>>;
+/**
+ * Retrieves List Report definition from the given application model.
+ * Only a single List Report page is expected, so the first match is returned.
  *
  * @param applicationModel - The application model containing page definitions.
- * @returns An array of List Report definitions.
+ * @returns An object containing the key and page definition of the List Report, or null if not found.
  */
-export declare function getListReportPage<T = ApplicationModel['pages'][string]>(applicationModel: ApplicationModel): T | null;
+export declare function getListReportPage(applicationModel: ApplicationModel): PageWithModelV4 | null;
 /**
- * Retrieves all Object Page definitions from the given application model.
+ * Retrieves all FPM Custom Page definitions from the given application model.
  *
  * @param applicationModel - The application model containing page definitions.
- * @returns An array of Object Page definitions.
+ * @param log - optional logger instance
+ * @returns An array of FPM Custom Page definitions.
+ */
+export declare function getFPMPage(applicationModel: ApplicationModel, log?: Logger): PageWithModelV4 | null;
+/**
+ * Gets FPM features from the page model using ux-specification.
+ *
+ * @param page - the FPM Custom Page containing model definitions
+ * @param log - optional logger instance
+ * @returns feature data extracted from the FPM Custom Page model
  */
-export declare function getObjectPages<T = ApplicationModel['pages'][string]>(applicationModel: ApplicationModel): T[];
+export declare function getFPMFeatures(page: PageWithModelV4, log?: Logger): FPMFeatures;
 /**
  * Retrieves the aggregations from the given tree aggregations node.
  *

package/dist/utils/modelUtils.js

@@ -1,45 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFeatureData = getFeatureData;
+exports.getAppFeatures = getAppFeatures;
+exports.getTableColumnData = getTableColumnData;
 exports.getListReportPage = getListReportPage;
-exports.getObjectPages = getObjectPages;
+exports.getFPMPage = getFPMPage;
+exports.getFPMFeatures = getFPMFeatures;
 exports.getAggregations = getAggregations;
 exports.getSelectionFieldItems = getSelectionFieldItems;
 exports.getFilterFields = getFilterFields;
 exports.getTableColumns = getTableColumns;
 const project_access_1 = require("@sap-ux/project-access");
+const page_1 = require("@sap/ux-specification/dist/types/src/common/page");
+const objectPageUtils_1 = require("./objectPageUtils");
+const listReportUtils_1 = require("./listReportUtils");
 /**
- * Gets feature data from the application model using ux-specification.
+ * Gets app features from the application model using ux-specification.
  *
  * @param basePath - the absolute target path where the application will be generated
  * @param fs - optional mem-fs editor instance
  * @param log - optional logger instance
+ * @param metadata - optional metadata for the OPA test generation
  * @returns feature data extracted from the application model
  */
-async function getFeatureData(basePath, fs, log) {
+async function getAppFeatures(basePath, fs, log, metadata) {
     const featureData = {};
     let listReportPage = null;
+    let objectPages = null;
+    let fpmPage = null;
+    let projectMetadata = metadata;
     // Read application model to extract control information needed for test generation
     // specification and readApp might not be available due to specification version, fail gracefully
     try {
         // readApp calls createApplicationAccess internally if given a path, but it uses the "live" version of project-access without fs enhancement
         const appAccess = await (0, project_access_1.createApplicationAccess)(basePath, { fs: fs });
         const specification = await appAccess.getSpecification();
-        const appResult = await specification.readApp({ app: appAccess, fs: fs });
-        listReportPage = appResult.applicationModel ? getListReportPage(appResult.applicationModel) : listReportPage;
+        const appModel = await specification.readApp({ app: appAccess, fs: fs });
+        if (!projectMetadata) {
+            const metadataPath = appAccess.project?.apps['']?.services?.mainService?.local;
+            if (metadataPath) {
+                projectMetadata = fs?.read(metadataPath);
+            }
+        }
+        listReportPage = appModel?.applicationModel ? getListReportPage(appModel.applicationModel) : listReportPage;
+        objectPages = appModel?.applicationModel ? (0, objectPageUtils_1.getObjectPages)(appModel.applicationModel) : objectPages;
+        fpmPage = appModel?.applicationModel ? getFPMPage(appModel.applicationModel, log) : fpmPage;
     }
     catch (error) {
         log?.warn('Error analyzing project model using specification. No dynamic tests will be generated. Error: ' +
             error.message);
         return featureData;
     }
-    if (!listReportPage) {
-        log?.warn('List Report page not found in application model. Dynamic tests will not be generated.');
+    if (!listReportPage && !objectPages && !fpmPage) {
+        log?.warn('Pages not found in application model. Dynamic tests will not be generated.');
         return featureData;
     }
     // attempt to get individual feature data
-    featureData.filterBarItems = getFilterFieldNames(listReportPage.model, log);
-    featureData.tableColumns = getTableColumnData(listReportPage.model, log);
+    try {
+        if (listReportPage) {
+            featureData.listReport = (0, listReportUtils_1.getListReportFeatures)(listReportPage, log, projectMetadata);
+        }
+        if (objectPages) {
+            log?.warn('Extracting Object Page features from application model');
+            featureData.objectPages = await (0, objectPageUtils_1.getObjectPageFeatures)(objectPages, listReportPage?.name, log);
+            log?.warn('objectPages features extracted: ' + JSON.stringify(featureData.objectPages));
+        }
+        if (fpmPage) {
+            featureData.fpm = getFPMFeatures(fpmPage, log);
+        }
+    }
+    catch (error) {
+        // do noting here, as individual feature extraction methods already log warnings
+    }
     return featureData;
 }
 /**
@@ -75,27 +106,6 @@ function transformTableColumns(columnAggregations) {
     });
     return columns;
 }
-/**
- * Retrieves filter field names from the page model using ux-specification.
- *
- * @param pageModel - the tree model containing filter bar definitions
- * @param log - optional logger instance
- * @returns - an array of filter field names
- */
-function getFilterFieldNames(pageModel, log) {
-    let filterBarItems = [];
-    try {
-        const filterBarAggregations = getFilterFields(pageModel);
-        filterBarItems = getSelectionFieldItems(filterBarAggregations);
-    }
-    catch (error) {
-        log?.debug(error);
-    }
-    if (!filterBarItems?.length) {
-        log?.warn('Unable to extract filter fields from project model using specification. No filter field tests will be generated.');
-    }
-    return filterBarItems;
-}
 /**
  * Retrieves table column data from the page model using ux-specification.
  *
@@ -118,35 +128,53 @@ function getTableColumnData(pageModel, log) {
     return tableColumns;
 }
 /**
- * Retrieves all List Report definitions from the given application model.
+ * Retrieves List Report definition from the given application model.
+ * Only a single List Report page is expected, so the first match is returned.
  *
  * @param applicationModel - The application model containing page definitions.
- * @returns An array of List Report definitions.
+ * @returns An object containing the key and page definition of the List Report, or null if not found.
  */
 function getListReportPage(applicationModel) {
     for (const pageKey in applicationModel.pages) {
         const page = applicationModel.pages[pageKey];
-        if (page.pageType === 'ListReport') {
+        if (page.pageType === page_1.PageTypeV4.ListReport) {
+            page.name = pageKey; // store page key as name for later identification
             return page;
         }
     }
     return null;
 }
 /**
- * Retrieves all Object Page definitions from the given application model.
+ * Retrieves all FPM Custom Page definitions from the given application model.
  *
  * @param applicationModel - The application model containing page definitions.
- * @returns An array of Object Page definitions.
+ * @param log - optional logger instance
+ * @returns An array of FPM Custom Page definitions.
  */
-function getObjectPages(applicationModel) {
-    const objectPages = [];
+function getFPMPage(applicationModel, log) {
     for (const pageKey in applicationModel.pages) {
         const page = applicationModel.pages[pageKey];
-        if (page.pageType === 'ObjectPage') {
-            objectPages.push(page);
+        log?.warn('pageType:' + page.pageType);
+        if (page.pageType === page_1.PageTypeV4.FPMCustomPage) {
+            page.name = pageKey; // store page key as name for later identification
+            return page;
         }
     }
-    return objectPages;
+    return null;
+}
+/**
+ * Gets FPM features from the page model using ux-specification.
+ *
+ * @param page - the FPM Custom Page containing model definitions
+ * @param log - optional logger instance
+ * @returns feature data extracted from the FPM Custom Page model
+ */
+function getFPMFeatures(page, log) {
+    return {
+        name: page.name,
+        filterBarItems: (0, listReportUtils_1.getFilterFieldNames)(page.model, log),
+        tableColumns: getTableColumnData(page.model, log)
+    };
 }
 /**
  * Retrieves the aggregations from the given tree aggregations node.

package/dist/utils/objectPageUtils.d.ts

@@ -0,0 +1,21 @@
+import type { Logger } from '@sap-ux/logger';
+import type { ApplicationModel } from '@sap/ux-specification/dist/types/src/parser';
+import type { ObjectPageFeatures } from '../types';
+import type { PageWithModelV4 } from '@sap/ux-specification/dist/types/src/parser/application';
+/**
+ * Extracts feature data for object pages from the application model.
+ *
+ * @param objectPages - the array of object pages extracted from the application model
+ * @param listReportPageKey - the key of the List Report page in the application model, used to find navigation routes to object pages
+ * @param log - optional logger instance
+ * @returns a record of object page feature data
+ */
+export declare function getObjectPageFeatures(objectPages: PageWithModelV4[], listReportPageKey?: string, log?: Logger): Promise<ObjectPageFeatures[]>;
+/**
+ * Retrieves all Object Page definitions from the given application model, as long as the page is reachable via standard navigation routes.
+ *
+ * @param applicationModel - The application model containing page definitions.
+ * @returns An array of Object Page definitions.
+ */
+export declare function getObjectPages(applicationModel: ApplicationModel): PageWithModelV4[];
+//# sourceMappingURL=objectPageUtils.d.ts.map

package/dist/utils/objectPageUtils.js

@@ -0,0 +1,218 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getObjectPageFeatures = getObjectPageFeatures;
+exports.getObjectPages = getObjectPages;
+const modelUtils_1 = require("./modelUtils");
+const page_1 = require("@sap/ux-specification/dist/types/src/common/page");
+/**
+ * Extracts feature data for object pages from the application model.
+ *
+ * @param objectPages - the array of object pages extracted from the application model
+ * @param listReportPageKey - the key of the List Report page in the application model, used to find navigation routes to object pages
+ * @param log - optional logger instance
+ * @returns a record of object page feature data
+ */
+async function getObjectPageFeatures(objectPages, listReportPageKey, log) {
+    const objectPageFeatures = [];
+    if (!objectPages || objectPages.length === 0) {
+        log?.warn('Object Pages not found in application model. Dynamic tests will not be generated for Object Pages.');
+        return objectPageFeatures;
+    }
+    // attempt to get individual feature data for each object page
+    for (const objectPage of objectPages) {
+        const pageFeatureData = {};
+        pageFeatureData.name = objectPage.name;
+        pageFeatureData.navigationParents = getObjectPageNavigationParents(objectPage.name, objectPages, listReportPageKey);
+        // extract header sections (facets)
+        pageFeatureData.headerSections = extractObjectPageHeaderSectionsData(objectPage);
+        objectPageFeatures.push(pageFeatureData);
+    }
+    return objectPageFeatures;
+}
+/**
+ * Retrieves all Object Page definitions from the given application model, as long as the page is reachable via standard navigation routes.
+ *
+ * @param applicationModel - The application model containing page definitions.
+ * @returns An array of Object Page definitions.
+ */
+function getObjectPages(applicationModel) {
+    const objectPages = [];
+    for (const pageKey in applicationModel.pages) {
+        const page = applicationModel.pages[pageKey];
+        if (page.pageType === page_1.PageTypeV4.ObjectPage) {
+            page.name = pageKey; // store page key as name for later identification
+            objectPages.push(page);
+        }
+    }
+    return objectPages;
+}
+/**
+ * Finds parent pages for the object page, and returns their identifiers.
+ *
+ * @param targetObjectPageKey - key of the target object page
+ * @param objectPages - the array of object pages extracted from the application model
+ * @param listReportPageKey - the key of the List Report page in the application model, used to find navigation routes to object pages
+ * @returns navigation data including parent page identifiers
+ */
+function getObjectPageNavigationParents(targetObjectPageKey, objectPages, listReportPageKey) {
+    const navigationParents = {
+        parentLRName: listReportPageKey ?? '' // app is possibly malformed if no LR found
+    };
+    objectPages.forEach((objectPage) => {
+        const navigationRoutes = getNavigationRoutes(objectPage);
+        const routeToTargetOP = navigationRoutes.find((nav) => nav.route === targetObjectPageKey);
+        if (routeToTargetOP) {
+            navigationParents.parentOPName = objectPage.name;
+            navigationParents.parentOPTableSection = routeToTargetOP.identifier;
+        }
+    });
+    return navigationParents;
+}
+/**
+ *  Extracts header sections data from an object page model.
+ *
+ * @param objectPage - object page from the application model
+ * @returns header sections data
+ */
+function extractObjectPageHeaderSectionsData(objectPage) {
+    const headerSections = [];
+    if (objectPage.model) {
+        const headerAggregation = (0, modelUtils_1.getAggregations)(objectPage.model.root)['header'];
+        const sectionsAggregation = (0, modelUtils_1.getAggregations)(headerAggregation)['sections'];
+        const sections = (0, modelUtils_1.getAggregations)(sectionsAggregation);
+        Object.values(sections).forEach((section) => {
+            const facetId = getSectionIdentifier(section);
+            if (!facetId) {
+                // if no identifier can be found for the section, it is not possible to reliably identify it in tests, so skip it
+                return;
+            }
+            const sectionData = {
+                facetId: facetId,
+                stashed: getSectionStashedFlag(section),
+                custom: section.custom,
+                microChart: isSectionMicroChart(section),
+                form: isFormSection(section),
+                // collection: false // TODO: find out how to identify collection facets
+                title: section.title
+            };
+            if (sectionData.form) {
+                sectionData.fields = getHeaderSectionFormFields(section);
+            }
+            headerSections.push(sectionData);
+        });
+    }
+    return headerSections;
+}
+/**
+ * Gets the identifier of a section for OPA5 tests.
+ *
+ * @param section - section entry from ux specification
+ * @returns identifier of the section for OPA5 tests
+ */
+function getSectionIdentifier(section) {
+    return getSectionIdentifierFromKey(section) ?? getSectionIdentifierFromTitle(section);
+}
+/**
+ * Gets the identifier of a section from the 'ID' entry in the schema keys for OPA5 tests.
+ * If no such entry is found, undefined is returned.
+ *
+ * @param section - section entry from ux specification
+ * @returns identifier of the section for OPA5 tests; can be undefined if no 'ID' entry is found
+ */
+function getSectionIdentifierFromKey(section) {
+    const keyEntry = section?.schema?.keys?.find((key) => key.name === 'ID');
+    return keyEntry ? keyEntry.value.replace('#', '::') : undefined;
+}
+/**
+ * Gets the identifier of a section from its title for OPA5 tests.
+ *
+ * @param section - section entry from ux specification
+ * @returns identifier of the section for OPA5 tests; can be undefined if title is not in expected format
+ */
+function getSectionIdentifierFromTitle(section) {
+    return section.title?.slice(section.title?.lastIndexOf('.') + 1).replace('#', '::') ?? undefined;
+}
+/**
+ * Gets the stashed flag of a header section for OPA5 tests.
+ *
+ * @param headerSection - header section entry from ux specification
+ * @returns stashed flag of the header section for OPA5 tests; can be a boolean or a string depending on the specification version
+ */
+function getSectionStashedFlag(headerSection) {
+    return headerSection?.properties?.stashed?.freeText ?? false;
+}
+/**
+ * Gets form fields of a header section for OPA5 tests.
+ *
+ * @param section - section entry from ux specification
+ * @returns an array of form fields with their identifiers and bound properties for OPA5 tests
+ */
+function getHeaderSectionFormFields(section) {
+    const formFields = [];
+    const formAggregation = (0, modelUtils_1.getAggregations)(section)?.form;
+    const fieldsAggregation = (0, modelUtils_1.getAggregations)(formAggregation)?.fields;
+    const fields = (0, modelUtils_1.getAggregations)(fieldsAggregation);
+    if (fields) {
+        Object.keys(fields).forEach((fieldKey) => {
+            const field = fields[fieldKey];
+            if (field?.name) {
+                formFields.push({
+                    fieldGroupQualifier: getFieldGroupQualifier(formAggregation),
+                    field: field.schema.keys.find((key) => key.name === 'Value')?.value
+                });
+            }
+        });
+    }
+    return formFields;
+}
+/**
+ * Gets the field group qualifier of a form aggregation for OPA5 tests.
+ *
+ * @param formAggregation - form aggregation entry from ux specification
+ * @returns field group qualifier for OPA5 tests; can be undefined if not found
+ */
+function getFieldGroupQualifier(formAggregation) {
+    const fullTarget = formAggregation?.schema?.keys?.find((key) => key.name === 'Target')?.value;
+    return fullTarget?.split('#')[1];
+}
+/**
+ * Checks if the section contains a microChart based on it's name.
+ *
+ * @param section - section entry from ux specification
+ * @returns true if the section seems to contain a microChart, false otherwise
+ */
+function isSectionMicroChart(section) {
+    return section?.schema?.dataType === 'ChartDefinition';
+}
+/**
+ * Checks if the section contains a form based on it's aggregations.
+ *
+ * @param section - section entry from ux specification
+ * @returns true if the section seems to contain a form, false otherwise
+ */
+function isFormSection(section) {
+    return (0, modelUtils_1.getAggregations)(section)?.form !== undefined;
+}
+/**
+ * Retrieves navigation targets from the given page model.
+ *
+ * @param pageModel - The page model containing navigation definitions.
+ * @returns An array of navigation target identifiers.
+ */
+function getNavigationRoutes(pageModel) {
+    const navigationTargets = [];
+    if (!pageModel?.navigation) {
+        return navigationTargets;
+    }
+    Object.keys(pageModel.navigation).forEach((navigationKey) => {
+        if (pageModel.navigation) {
+            const navigationEntry = pageModel.navigation[navigationKey];
+            navigationTargets.push({
+                identifier: navigationKey,
+                route: typeof navigationEntry === 'string' ? navigationEntry : navigationEntry.route
+            });
+        }
+    });
+    return navigationTargets;
+}
+//# sourceMappingURL=objectPageUtils.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/ui5-test-writer",
   "description": "SAP UI5 tests writer",
-  "version": "0.7.89",
+  "version": "0.7.91",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,9 +25,11 @@
     "mem-fs": "2.1.0",
     "mem-fs-editor": "9.4.0",
     "@sap/ux-specification": "1.144.0",
-    "@sap-ux/ui5-application-writer": "1.8.0",
-    "@sap-ux/logger": "0.8.2",
-    "@sap-ux/project-access": "1.35.13"
+    "@sap-ux/edmx-parser": "0.10.0",
+    "@sap-ux/annotation-converter": "0.10.21",
+    "@sap-ux/ui5-application-writer": "1.8.1",
+    "@sap-ux/project-access": "1.35.14",
+    "@sap-ux/logger": "0.8.2"
   },
   "devDependencies": {
     "@types/ejs": "3.1.2",
@@ -36,6 +38,7 @@
     "@types/mem-fs-editor": "7.0.1",
     "rimraf": "6.1.3",
     "fs-extra": "11.3.4",
+    "@sap-ux/vocabularies-types": "0.15.0",
     "@sap-ux/jest-file-matchers": "0.2.11"
   },
   "engines": {

package/templates/v4/integration/FPMJourney.js

@@ -0,0 +1,49 @@
+/******************************************************************************
+ * ╔═══════════════════════════════════════════════════════════════════════╗ *
+ * ║                                                                       ║ *
+ * ║   WARNING: AUTO-GENERATED FILE                                        ║ *
+ * ║                                                                       ║ *
+ * ║   This file is automatically generated by SAP Fiori tools and is      ║ *
+ * ║   overwritten when you run the OPA test generator again.              ║ *
+ * ║                                                                       ║ *
+ * ║   To add your own custom tests:                                       ║ *
+ * ║   - Create a new journey test file in this directory.                 ║ *
+ * ║   - Follow the same pattern as this file.                             ║ *
+ * ║   - Add the new file to the opaTests.qunit.js config file.            ║ *
+ * ║   - Custom journey files are not overwritten.                         ║ *
+ * ║                                                                       ║ *
+ * ╚═══════════════════════════════════════════════════════════════════════╝ *
+ ******************************************************************************/
+
+sap.ui.define([
+    "sap/ui/test/opaQunit",
+    "./pages/JourneyRunner"
+], function (opaTest, runner) {
+    "use strict";
+
+    function journey() {
+        QUnit.module("FPM journey");
+
+        opaTest("Start application", function (Given, When, Then) {
+            Given.iStartMyApp();
+            <%_ startPages.forEach(function(pageName) { %>
+            Then.onThe<%- pageName %>.iSeeThisPage();
+            <%_ if (filterBarItems && filterBarItems.length > 0) { -%>
+                <%_ filterBarItems.forEach(function(item) { _%>
+            Then.onThe<%- pageName%>.onFilterBar().iCheckFilterField("<%- item %>");
+                <%_ }); -%>
+            <%_ } -%>
+            <%_ if (tableColumns && Object.keys(tableColumns).length > 0) { _%>
+            Then.onThe<%- pageName %>.onTable().iCheckColumns(<%- Object.keys(tableColumns).length %>, <%- JSON.stringify(tableColumns) %>);
+            <%_ } %>
+            <%_ }); -%>
+        });
+
+        opaTest("Teardown", function (Given, When, Then) { 
+            // Cleanup
+            Given.iTearDownMyApp();
+        });
+    }
+
+    runner.run([journey]);
+});

package/templates/v4/integration/FirstJourney.js

@@ -9,17 +9,7 @@ sap.ui.define([
 
         opaTest("Start application", function (Given, When, Then) {
             Given.iStartMyApp();
-            <%_ startPages.forEach(function(pageName) { %>
-            Then.onThe<%- pageName %>.iSeeThisPage();
-            <%_ if (filterBarItems && filterBarItems.length > 0 && !hideFilterBar) { -%>
-                <%_ filterBarItems.forEach(function(item) { _%>
-            Then.onThe<%- pageName%>.onFilterBar().iCheckFilterField("<%- item %>");
-                <%_ }); -%>
-            <%_ } -%>
-            <%_ if (tableColumns && Object.keys(tableColumns).length > 0) { _%>
-            Then.onThe<%- pageName %>.onTable().iCheckColumns(<%- Object.keys(tableColumns).length %>, <%- JSON.stringify(tableColumns) %>);
-            <%_ } %>
-            <%_ }); -%>
+            <% if (startLR) { %>Then.onThe<%- startLR %>.iSeeThisPage();<%} %>
         });
 
 <% if (startLR) { %>