@sap-ux/ui5-test-writer 0.7.20 → 0.7.21

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

@@ -250,6 +250,10 @@ function generateOPAFiles(basePath, opaConfig, fs) {
     editor.copyTpl((0, path_1.join)(rootV4TemplateDirPath, 'integration/FirstJourney.js'), (0, path_1.join)(testOutDirPath, `integration/${config.opaJourneyFileName}.js`), journeyParams, undefined, {
         globOptions: { dot: true }
     });
+    // Journey Runner
+    editor.copyTpl((0, path_1.join)(rootV4TemplateDirPath, 'integration', 'pages', 'JourneyRunner.js'), (0, path_1.join)(testOutDirPath, 'integration', 'pages', 'JourneyRunner.js'), config, undefined, {
+        globOptions: { dot: true }
+    });
     return editor;
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/ui5-test-writer",
   "description": "SAP UI5 tests writer",
-  "version": "0.7.20",
+  "version": "0.7.21",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",

package/templates/v4/integration/FirstJourney.js

@@ -1,38 +1,37 @@
 sap.ui.define([
-    "sap/ui/test/opaQunit"
-], function (opaTest) {
+    "sap/ui/test/opaQunit",
+    "./pages/JourneyRunner"
+], function (opaTest, runner) {
     "use strict";
 
-    var Journey = {
-        run: function() {
-            QUnit.module("First journey");
+    function journey() {
+        QUnit.module("First journey");
 
-            opaTest("Start application", function (Given, When, Then) {
-                Given.iStartMyApp();
+        opaTest("Start application", function (Given, When, Then) {
+            Given.iStartMyApp();
 <% startPages.forEach(function(pageName) { %>
-                Then.onThe<%- pageName%>.iSeeThisPage();
+            Then.onThe<%- pageName%>.iSeeThisPage();
 <% });%>
-            });
+        });
 
 <% if (startLR) { %>
-            opaTest("Navigate to ObjectPage", function (Given, When, Then) {
-                // Note: this test will fail if the ListReport page doesn't show any data
-                <% if (!hideFilterBar) { %>
-                When.onThe<%- startLR%>.onFilterBar().iExecuteSearch();
-                <%} %>
-                Then.onThe<%- startLR%>.onTable().iCheckRows();
+        opaTest("Navigate to ObjectPage", function (Given, When, Then) {
+            // Note: this test will fail if the ListReport page doesn't show any data
+            <% if (!hideFilterBar) { %>
+            When.onThe<%- startLR%>.onFilterBar().iExecuteSearch();
+            <%} %>
+            Then.onThe<%- startLR%>.onTable().iCheckRows();
 <% if (navigatedOP) { %>
-                When.onThe<%- startLR%>.onTable().iPressRow(0);
-                Then.onThe<%- navigatedOP%>.iSeeThisPage();
+            When.onThe<%- startLR%>.onTable().iPressRow(0);
+            Then.onThe<%- navigatedOP%>.iSeeThisPage();
 <%} %>
-            });
+        });
 <%} %>
-            opaTest("Teardown", function (Given, When, Then) { 
-                // Cleanup
-                Given.iTearDownMyApp();
-            });
-        }
+        opaTest("Teardown", function (Given, When, Then) { 
+            // Cleanup
+            Given.iTearDownMyApp();
+        });
     }
 
-    return Journey;
+    runner.run([journey]);
 });

package/templates/v4/integration/opaTests.qunit.html

@@ -17,9 +17,6 @@
 
     <link rel="stylesheet" type="text/css" href="../../resources/sap/ui/thirdparty/qunit-2.css">
 
-    <script src="../../resources/sap/ui/thirdparty/qunit-2.js"></script>
-    <script src="../../resources/sap/ui/qunit/qunit-junit.js"></script>
-
     <script src="opaTests.qunit.js"></script>
 
 </head>

package/templates/v4/integration/opaTests.qunit.js

@@ -1,24 +1,29 @@
-sap.ui.require(
-    [
-        'sap/fe/test/JourneyRunner',
-        '<%- appPath %>/test/integration/<%- opaJourneyFileName %>',
-<%- pages.map((page) => {return "\t\t'" + page.appPath + '/test/integration/pages/' + page.targetKey + "'";}).join(',\n')%>
-    ],
-    function(JourneyRunner, opaJourney, <%- pages.map(function(page) {return page.targetKey;}).join(', ')%>) {
-        'use strict';
-        var JourneyRunner = new JourneyRunner({
-            // start <%- htmlTarget %> in web folder
-            launchUrl: sap.ui.require.toUrl('<%- appPath %>') + '/<%- htmlTarget %>'
-        });
-
-       
-        JourneyRunner.run(
-            {
-                pages: { 
-<%- pages.map((page) => {return '\t\t\t\t\tonThe' + page.targetKey + ': ' + page.targetKey}).join(',\n')%>
-                }
-            },
-            opaJourney.run
-        );
+sap.ui.loader.config({
+    shim: {
+        "sap/ui/qunit/qunit-junit": {
+            deps: ["sap/ui/thirdparty/qunit-2"]
+        },
+        "sap/ui/qunit/qunit-coverage": {
+            deps: ["sap/ui/thirdparty/qunit-2"]
+        },
+        "sap/ui/thirdparty/sinon-qunit": {
+            deps: ["sap/ui/thirdparty/qunit-2", "sap/ui/thirdparty/sinon"]
+        },
+        "sap/ui/qunit/sinon-qunit-bridge": {
+            deps: ["sap/ui/thirdparty/qunit-2", "sap/ui/thirdparty/sinon-4"]
+        }
     }
-);
+});
+
+window.QUnit = Object.assign({}, window.QUnit, { config: { autostart: false } });
+
+sap.ui.require(
+  [
+    "sap/ui/thirdparty/qunit-2",
+    "sap/ui/qunit/qunit-junit",
+    "sap/ui/qunit/qunit-coverage",
+    '<%- appPath %>/test/integration/<%- opaJourneyFileName %>'
+  ], function (QUnit) {
+    "use strict";
+    QUnit.start();
+});

package/templates/v4/integration/pages/JourneyRunner.js

@@ -0,0 +1,17 @@
+sap.ui.define([
+    "sap/fe/test/JourneyRunner",
+<%- pages.map((page) => {return "\t\"" + page.appPath + '/test/integration/pages/' + page.targetKey + "\"";}).join(',\n')%>
+], function (JourneyRunner, <%- pages.map(function(page) {return page.targetKey;}).join(', ')%>) {
+    'use strict';
+
+    var runner = new JourneyRunner({
+        launchUrl: sap.ui.require.toUrl('<%- appPath %>') + '/<%- htmlTarget %>',
+        pages: {
+<%- pages.map((page) => {return '\t\t\tonThe' + page.targetKey + ': ' + page.targetKey}).join(',\n')%>
+        },
+        async: true
+    });
+
+    return runner;
+});
+