update SAPUI5 versions

- remove duplicated crud test - add scripts to test all SAPUI5 versions - add recommended vscode extension
cap-js-community · Oct 10, 2023 · 30a899a · 30a899a
1 parent 93fc189
commit 30a899a
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 35 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "cucumberopen.cucumber-official",
+  ]
+}
diff --git a/cds-plugins/local-ui5-build/.sapui5.version.sh b/cds-plugins/local-ui5-build/.sapui5.version.sh
@@ -6,6 +6,6 @@ if [ -z "${SAP_UI5_VERSION}" ]; then
   #export SAP_UI5_VERSION="1.114.6"
   #export SAP_UI5_VERSION="1.115.1"
   #export SAP_UI5_VERSION="1.116.0"
-  #export SAP_UI5_VERSION="1.117.1"
-  export SAP_UI5_VERSION="1.118.0"
+  #export SAP_UI5_VERSION="1.117.2"
+  export SAP_UI5_VERSION="1.118.1"
 fi
diff --git a/lib/controller.js b/lib/controller.js
@@ -81,16 +81,16 @@ class Controller {
   }
 
   async injectLibrary() {
-    const path = require('node:path')
-    const fs = require('node:fs')
+    const path = require('node:path');
+    const fs = require('node:fs');
     let filename = './lib/browser.js';
     try {
       const moduleName = this.getModuleName();
       filename = require.resolve(`${moduleName}/lib/browser.js`);
     } catch(e) {
       try {
         // local import from current directory
-        filename = path.resolve(__dirname, 'browser.js')
+        filename = path.resolve(__dirname, 'browser.js');
       } catch(e1){}
     }
     if(env.CDS_INSTRUMENTED_CODECOV_BROWSER_EXT) {

diff --git a/test/bin/.sapui5.version.sh b/test/bin/.sapui5.version.sh
@@ -6,6 +6,6 @@ if [ -z "${SAP_UI5_VERSION}" ]; then
   #export SAP_UI5_VERSION="1.114.6"
   #export SAP_UI5_VERSION="1.115.1"
   #export SAP_UI5_VERSION="1.116.0"
-  #export SAP_UI5_VERSION="1.117.1"
-  export SAP_UI5_VERSION="1.118.0"
+  #export SAP_UI5_VERSION="1.117.2"
+  export SAP_UI5_VERSION="1.118.1"
 fi
diff --git a/test/bin/build.ui5.all.sh b/test/bin/build.ui5.all.sh
@@ -4,7 +4,8 @@ SAP_UI5_VERSION="1.110.1" ./test/bin/build.ui5.sh
 SAP_UI5_VERSION="1.111.8" ./test/bin/build.ui5.sh
 SAP_UI5_VERSION="1.112.3" ./test/bin/build.ui5.sh
 SAP_UI5_VERSION="1.113.0" ./test/bin/build.ui5.sh
-SAP_UI5_VERSION="1.114.2" ./test/bin/build.ui5.sh
+SAP_UI5_VERSION="1.114.6" ./test/bin/build.ui5.sh
 SAP_UI5_VERSION="1.115.1" ./test/bin/build.ui5.sh
 SAP_UI5_VERSION="1.116.0" ./test/bin/build.ui5.sh
-SAP_UI5_VERSION="1.117.1" ./test/bin/build.ui5.sh
+SAP_UI5_VERSION="1.117.2" ./test/bin/build.ui5.sh
+SAP_UI5_VERSION="1.118.1" ./test/bin/build.ui5.sh
diff --git a/test/bin/build.ui5.all.tgz.sh b/test/bin/build.ui5.all.tgz.sh
@@ -7,5 +7,5 @@ SAP_UI5_VERSION="1.113.0" ./test/bin/build.ui5.tgz.sh
 SAP_UI5_VERSION="1.114.6" ./test/bin/build.ui5.tgz.sh
 SAP_UI5_VERSION="1.115.1" ./test/bin/build.ui5.tgz.sh
 SAP_UI5_VERSION="1.116.0" ./test/bin/build.ui5.tgz.sh
-SAP_UI5_VERSION="1.117.1" ./test/bin/build.ui5.tgz.sh
-SAP_UI5_VERSION="1.118.0" ./test/bin/build.ui5.tgz.sh
+SAP_UI5_VERSION="1.117.2" ./test/bin/build.ui5.tgz.sh
+SAP_UI5_VERSION="1.118.1" ./test/bin/build.ui5.tgz.sh
diff --git a/test/bin/testBookshop.All.Versions.PARALLEL.sh b/test/bin/testBookshop.All.Versions.PARALLEL.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+for dir in ls ./tmp/sapui5/full*
+do
+  VERSION="${dir:18}"
+  if [ -n "${VERSION}" ]; then
+    NOW=`date +%d.%m.%Y-%H.%M.%S`
+    LOGFILENAME="/tmp/cds-cucumber-${VERSION}-${NOW}.log"
+    echo "test ${VERSION} ${LOGFILENAME}"
+    SAP_UI5_VERSION=${VERSION} test/bin/testBookshopWithLocalUI5plugin.sh &> ${LOGFILENAME}
+    echo $?
+  fi
+done
diff --git a/test/bin/testBookshop.All.Versions.PARALLEL.tgz.sh b/test/bin/testBookshop.All.Versions.PARALLEL.tgz.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+for dir in ls ./tmp/sapui5/sapui5-*.tgz
+do
+  VERSION="${dir:20:7}"
+  if [ -n "${VERSION}" ]; then
+    NOW=`date +%d.%m.%Y-%H.%M.%S`
+    LOGFILENAME="/tmp/cds-cucumber-${VERSION}-${NOW}.log"
+    echo "test ${VERSION} ${LOGFILENAME}"
+    SAP_UI5_VERSION=${VERSION} test/bin/testBookshopWithLocalUI5.uds.tgz.sh &> ${LOGFILENAME}
+    echo $?
+  fi
+done
diff --git a/test/bin/testSFlight.All.Versions.PARALLEL.sh b/test/bin/testSFlight.All.Versions.PARALLEL.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+for dir in ls ./tmp/sapui5/full*
+do
+  VERSION="${dir:18}"
+  if [ -n "${VERSION}" ]; then
+    NOW=`date +%d.%m.%Y-%H.%M.%S`
+    LOGFILENAME="/tmp/cds-cucumber-${VERSION}-${NOW}.log"
+    echo "test ${VERSION} ${LOGFILENAME}"
+    SAP_UI5_VERSION=${VERSION} test/bin/testSFlightWithLocalUI5plugin.PARALLEL.sh &> ${LOGFILENAME}
+    echo $?
+  fi
+done
diff --git a/test/bin/testSFlight.All.Versions.PARALLEL.tgz.sh b/test/bin/testSFlight.All.Versions.PARALLEL.tgz.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+for dir in ls ./tmp/sapui5/sapui5-*.tgz
+do
+  VERSION="${dir:20:7}"
+  if [ -n "${VERSION}" ]; then
+    NOW=`date +%d.%m.%Y-%H.%M.%S`
+    LOGFILENAME="/tmp/cds-cucumber-${VERSION}-${NOW}.log"
+    echo "test ${VERSION} ${LOGFILENAME}"
+    SAP_UI5_VERSION=${VERSION} test/bin/testSFlightWithLocalUI5.uds.tgz.sh &> ${LOGFILENAME}
+    echo $?
+  fi
+done
diff --git a/test/features/odata/crud.feature b/test/features/odata/crud.feature
@@ -117,30 +117,6 @@ Feature: crud
     [ { "number": 2 }, { "number": 1 } ]
     """
 
-  Scenario: order by - full match
-    Given we have created a new record in entity OrderBy
-      """
-      {"number":2}
-      """
-      And we have created a new record in entity OrderBy
-        """
-        {"number":1}
-        """
-    When we prepare to read entity OrderBy
-      And select its number
-      And order by number
-      And do perform the read
-    Then we expect the result to contain the following details
-    """
-    [ { "number": 1 }, { "number": 2 } ]
-    """
-    When we want to order descending by number
-      And we read entity OrderBy by selecting number
-    Then we expect the result to contain the following details
-    """
-    [ { "number": 2 }, { "number": 1 } ]
-    """
-
   # group by
 
   Scenario: group by