diff --git a/CHANGELOG.md b/CHANGELOG.md index bb877a2..c94521a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed +* OData: expectation step "its {word} to be {word}" + ## Version 0.3.1 - 2023-10-13 ### Fixed diff --git a/cds-plugins/local-ui5-build/.sapui5.version.sh b/cds-plugins/local-ui5-build/.sapui5.version.sh index 6a92121..6ad4d58 100644 --- a/cds-plugins/local-ui5-build/.sapui5.version.sh +++ b/cds-plugins/local-ui5-build/.sapui5.version.sh @@ -3,9 +3,10 @@ if [ -z "${SAP_UI5_VERSION}" ]; then #export SAP_UI5_VERSION="1.111.8" #export SAP_UI5_VERSION="1.112.3" #export SAP_UI5_VERSION="1.113.0" - #export SAP_UI5_VERSION="1.114.6" + #export SAP_UI5_VERSION="1.114.8" #export SAP_UI5_VERSION="1.115.1" #export SAP_UI5_VERSION="1.116.0" - #export SAP_UI5_VERSION="1.117.2" - export SAP_UI5_VERSION="1.118.1" + #export SAP_UI5_VERSION="1.117.3" + #export SAP_UI5_VERSION="1.118.1" + export SAP_UI5_VERSION="1.119.1" fi diff --git a/cds-plugins/local-ui5-build/files/ui5.yaml b/cds-plugins/local-ui5-build/files/ui5.yaml index 177b3e3..822b239 100644 --- a/cds-plugins/local-ui5-build/files/ui5.yaml +++ b/cds-plugins/local-ui5-build/files/ui5.yaml @@ -5,7 +5,7 @@ metadata: type: application framework: name: SAPUI5 - version: "1.114.0" + version: "1.119.1" libraries: - name: sap.fe.templates - name: sap.suite.ui.generic.template diff --git a/lib/steps/odata/expectations.js b/lib/steps/odata/expectations.js index fff3339..6881ecc 100644 --- a/lib/steps/odata/expectations.js +++ b/lib/steps/odata/expectations.js @@ -18,7 +18,7 @@ const { Then } = require('@cucumber/cucumber'); * @example Then its {word} to be {word} */ Then('its {word} to be {word}', async function(field, value) { - assert.equal(value, this.result[field]); + assert.equal(this.result[field], value); }) /** diff --git a/package-lock.json b/package-lock.json index 75a1180..8fbea20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "chai": "^4", "chai-shallow-deep-equal": "^1", "chai-sorted": "^0.2", - "chromedriver": "^117", + "chromedriver": "^118", "selenium-webdriver": "^4", "sqlite3": "^5" }, @@ -194,6 +194,8 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", + "optional": true, + "peer": true, "engines": { "node": ">=0.1.90" } @@ -541,12 +543,12 @@ } }, "node_modules/@sap-cloud-sdk/connectivity": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/connectivity/-/connectivity-3.6.0.tgz", - "integrity": "sha512-N9Zt/uuHqA3xHYvLzNuGfz3GryCHYnm6WPRBl17HyLE+I2qou+ZKvgeeLgnzas9yTV/0qhHoOM2goEM99Up4Ew==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/connectivity/-/connectivity-3.7.0.tgz", + "integrity": "sha512-PoMWjuyfl50tmtHRUmd3sJ09QK+TdSM4RcKra0ZsJlQoBciIhtTGnulWfS3QKL7nam5m4HkE7K4KasKMSipg7g==", "dependencies": { - "@sap-cloud-sdk/resilience": "^3.6.0", - "@sap-cloud-sdk/util": "^3.6.0", + "@sap-cloud-sdk/resilience": "^3.7.0", + "@sap-cloud-sdk/util": "^3.7.0", "@sap/xsenv": "^4.0.0", "@sap/xssec": "^3.2.17", "async-retry": "^1.3.3", @@ -555,35 +557,35 @@ } }, "node_modules/@sap-cloud-sdk/http-client": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/http-client/-/http-client-3.6.0.tgz", - "integrity": "sha512-EjgikZYpmtjNCAul0YJDfDzFRr0q+t5OYDhQy8QJ7uaQSLdtWlHGVbf59lGwz46bL1cH0S2jqFsxioi3V38ogg==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/http-client/-/http-client-3.7.0.tgz", + "integrity": "sha512-UfI0wXaIzgXQRE6K6ZTEOCuwU0dWsHX4VIzPzTP20ZQDV+h0ZcE8REl7cRpKKua18YYV4mj+sP6gWCfmNWJXHg==", "dependencies": { - "@sap-cloud-sdk/connectivity": "^3.6.0", - "@sap-cloud-sdk/resilience": "^3.6.0", - "@sap-cloud-sdk/util": "^3.6.0", + "@sap-cloud-sdk/connectivity": "^3.7.0", + "@sap-cloud-sdk/resilience": "^3.7.0", + "@sap-cloud-sdk/util": "^3.7.0", "axios": "^1.5.1" } }, "node_modules/@sap-cloud-sdk/resilience": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/resilience/-/resilience-3.6.0.tgz", - "integrity": "sha512-IsXA91GzJLpI0jdlDAUQ2wrNIZjU9T3MCbcDPU8WkWJl43czRrM8zD7hfF0eZLGavz0fRMIEVUGLY3+YR+XJ6A==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/resilience/-/resilience-3.7.0.tgz", + "integrity": "sha512-fD0xTyASqYnyGJ8sxZFmGz3Vkj176gisBTPEvMN6/VstLTHNlY4amMgXulFtvmWwTaXBFDrl23HKYkRzwGnpyQ==", "dependencies": { - "@sap-cloud-sdk/util": "^3.6.0", + "@sap-cloud-sdk/util": "^3.7.0", "async-retry": "^1.3.3", "axios": "^1.5.1", - "opossum": "^8.1.1" + "opossum": "^8.1.2" } }, "node_modules/@sap-cloud-sdk/util": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/util/-/util-3.6.0.tgz", - "integrity": "sha512-iiDsjICb7gemVZ8to6BvDPD7Wp8ritnoaWFwu3fO31s8ixOYgaUyeyAtVE9uf5Yci+QTT26cLNo84SzFgtFAIg==", + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/@sap-cloud-sdk/util/-/util-3.7.0.tgz", + "integrity": "sha512-OvAfdX8m3VSiUlxd706h51dYRPraQf9ILNn4TpabkPRpB/D2tn8PlY/fTFuIReZbFflvkDJB5A+jBPDaQXrdig==", "dependencies": { "axios": "^1.5.1", "chalk": "^4.1.0", - "logform": "^2.5.1", + "logform": "^2.6.0", "voca": "^1.4.1", "winston": "^3.10.0", "winston-transport": "^4.5.0" @@ -743,9 +745,9 @@ } }, "node_modules/@types/node": { - "version": "20.8.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.5.tgz", - "integrity": "sha512-SPlobFgbidfIeOYlzXiEjSYeIJiOCthv+9tSQVpvk4PAdIIc+2SmjNVzWXk9t0Y7dl73Zdf+OgXKHX9XtkqUpw==", + "version": "20.8.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.6.tgz", + "integrity": "sha512-eWO4K2Ji70QzKUqRy6oyJWUeB7+g2cRagT3T/nxYibYcT4y2BDL8lqolRXjTHmkZCdJfIPaY73KbJAZmcryxTQ==", "optional": true, "dependencies": { "undici-types": "~5.25.1" @@ -1261,9 +1263,9 @@ } }, "node_modules/chromedriver": { - "version": "117.0.3", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-117.0.3.tgz", - "integrity": "sha512-c2rk2eGK5zZFBJMdviUlAJfQEBuPNIKfal4+rTFVYAmrWbMPYAqPozB+rIkc1lDP/Ryw44lPiqKglrI01ILhTQ==", + "version": "118.0.1", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-118.0.1.tgz", + "integrity": "sha512-GlGfyRE47IuSJnuadIiDy89EMDMQFBVWxUmiclLJKzQhFsiWAtcIr/mNOxjljZdsw9IwIOQEkrB9wympKYFPLw==", "hasInstallScript": true, "dependencies": { "@testim/chrome-version": "^1.1.3", @@ -2534,16 +2536,27 @@ "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" }, "node_modules/logform": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/logform/-/logform-2.5.1.tgz", - "integrity": "sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz", + "integrity": "sha512-1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==", "dependencies": { - "@colors/colors": "1.5.0", + "@colors/colors": "1.6.0", "@types/triple-beam": "^1.3.2", "fecha": "^4.2.0", "ms": "^2.1.1", "safe-stable-stringify": "^2.3.1", "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/logform/node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "engines": { + "node": ">=0.1.90" } }, "node_modules/loupe": { @@ -3140,9 +3153,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.0.tgz", + "integrity": "sha512-HQ4J+ic8hKrgIt3mqk6cVOVrW2ozL4KdvHlqpBv9vDYWx9ysAgENAdvy4FoGF+KFdhR7nQTNm5J0ctAeOwn+3g==", "peer": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3398,9 +3411,9 @@ } }, "node_modules/property-expr": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.5.tgz", - "integrity": "sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==", + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/property-expr/-/property-expr-2.0.6.tgz", + "integrity": "sha512-SVtmxhRE/CGkn3eZY1T6pC8Nln6Fr/lu1mKSgRud0eC73whjGfoAogbn78LkD8aFL0zz3bAFerKSnOl7NlErBA==", "peer": true }, "node_modules/proxy-addr": { @@ -4480,16 +4493,16 @@ } }, "node_modules/winston-transport": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz", - "integrity": "sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.6.0.tgz", + "integrity": "sha512-wbBA9PbPAHxKiygo7ub7BYRiKxms0tpfU2ljtWzb3SjRjv5yl6Ozuy/TkXf00HTAt+Uylo3gSkNwzc4ME0wiIg==", "dependencies": { "logform": "^2.3.2", "readable-stream": "^3.6.0", "triple-beam": "^1.3.0" }, "engines": { - "node": ">= 6.4.0" + "node": ">= 12.0.0" } }, "node_modules/winston-transport/node_modules/readable-stream": { @@ -4662,9 +4675,9 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yaml": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", - "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.3.tgz", + "integrity": "sha512-zw0VAJxgeZ6+++/su5AFoqBbZbrEakwu+X0M5HmcwUiBL7AzcuPKjj5we4xfQLp78LkEMpD0cOnUhmgOVy3KdQ==", "engines": { "node": ">= 14" } diff --git a/package.json b/package.json index 7506cf4..34a5b07 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "chai": "^4", "chai-shallow-deep-equal": "^1", "chai-sorted": "^0.2", - "chromedriver": "^117", + "chromedriver": "^118", "selenium-webdriver": "^4", "sqlite3": "^5" }, diff --git a/test/bin/.sapui5.version.sh b/test/bin/.sapui5.version.sh index 6a92121..6ad4d58 100644 --- a/test/bin/.sapui5.version.sh +++ b/test/bin/.sapui5.version.sh @@ -3,9 +3,10 @@ if [ -z "${SAP_UI5_VERSION}" ]; then #export SAP_UI5_VERSION="1.111.8" #export SAP_UI5_VERSION="1.112.3" #export SAP_UI5_VERSION="1.113.0" - #export SAP_UI5_VERSION="1.114.6" + #export SAP_UI5_VERSION="1.114.8" #export SAP_UI5_VERSION="1.115.1" #export SAP_UI5_VERSION="1.116.0" - #export SAP_UI5_VERSION="1.117.2" - export SAP_UI5_VERSION="1.118.1" + #export SAP_UI5_VERSION="1.117.3" + #export SAP_UI5_VERSION="1.118.1" + export SAP_UI5_VERSION="1.119.1" fi diff --git a/test/bin/build.ui5.all.sh b/test/bin/build.ui5.all.sh index 90426df..b70db38 100755 --- a/test/bin/build.ui5.all.sh +++ b/test/bin/build.ui5.all.sh @@ -4,8 +4,9 @@ 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.6" ./test/bin/build.ui5.sh +SAP_UI5_VERSION="1.114.8" ./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.2" ./test/bin/build.ui5.sh +SAP_UI5_VERSION="1.117.3" ./test/bin/build.ui5.sh SAP_UI5_VERSION="1.118.1" ./test/bin/build.ui5.sh +SAP_UI5_VERSION="1.119.1" ./test/bin/build.ui5.sh diff --git a/test/bin/build.ui5.all.tgz.sh b/test/bin/build.ui5.all.tgz.sh index 942282f..54dd743 100755 --- a/test/bin/build.ui5.all.tgz.sh +++ b/test/bin/build.ui5.all.tgz.sh @@ -4,8 +4,9 @@ SAP_UI5_VERSION="1.110.1" ./test/bin/build.ui5.tgz.sh SAP_UI5_VERSION="1.111.8" ./test/bin/build.ui5.tgz.sh SAP_UI5_VERSION="1.112.3" ./test/bin/build.ui5.tgz.sh 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.114.8" ./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.2" ./test/bin/build.ui5.tgz.sh +SAP_UI5_VERSION="1.117.3" ./test/bin/build.ui5.tgz.sh SAP_UI5_VERSION="1.118.1" ./test/bin/build.ui5.tgz.sh +SAP_UI5_VERSION="1.119.1" ./test/bin/build.ui5.tgz.sh