Skip to content

Commit

Permalink
chore: bump ui5, tooling and wdi5 versions (#315)
Browse files Browse the repository at this point in the history
* chore: bump ui5, tooling and wdi5 versions

* test: add wait-on to see if it fails due to async tasks
  • Loading branch information
wridgeu authored Nov 16, 2023
1 parent bdf28fe commit 35c084f
Show file tree
Hide file tree
Showing 7 changed files with 12,903 additions and 9,291 deletions.
22,099 changes: 12,859 additions & 9,240 deletions package-lock.json

Large diffs are not rendered by default.

78 changes: 36 additions & 42 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,60 +32,54 @@
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
"hooks:pre-commit": "npm-run-all --sequential prettier:staged lint:staged",
"hooks:pre-push": "npm-run-all --sequential lint:commit",
"test": "wdio run wdio.conf.js"
"test": "wait-on tcp:8080 && wdio run wdio.conf.js"
},
"dependencies": {
"chart.js": "^3.9.1",
"ui5-cc-md": "^0.0.6"
"chart.js": "^4.3.3",
"ui5-cc-md": "^0.0.7"
},
"devDependencies": {
"@babel/cli": "^7.19.3",
"@babel/core": "^7.19.6",
"@babel/preset-env": "^7.19.4",
"@babel/preset-typescript": "^7.18.6",
"@babel/register": "^7.18.9",
"@commitlint/cli": "^17.2.0",
"@commitlint/config-conventional": "^17.2.0",
"@openui5/ts-types-esm": "1.108.0",
"@babel/cli": "^7.22.9",
"@babel/core": "^7.22.9",
"@babel/preset-env": "^7.22.9",
"@babel/preset-typescript": "^7.22.5",
"@babel/register": "^7.22.5",
"@commitlint/cli": "^17.6.7",
"@commitlint/config-conventional": "^17.6.7",
"@openui5/ts-types-esm": "1.116.0",
"@prettier/plugin-xml": "^2.2.0",
"@types/chart.js": "2.9.37",
"@types/jquery": "3.5.14",
"@types/node": "^18.11.9",
"@types/node-fetch": "^2.6.2",
"@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.42.0",
"@ui5/cli": "^2.14.14",
"@ui5/ts-interface-generator": "^0.5.2",
"@wdio/cli": "^7.25.4",
"@wdio/local-runner": "^7.25.4",
"@wdio/mocha-framework": "^7.25.4",
"@wdio/spec-reporter": "^7.25.4",
"babel-preset-transform-ui5": "^7.0.5",
"chromedriver": "^107.0.3",
"conventional-changelog-cli": "^2.2.2",
"@types/jquery": "3.5.16",
"@types/node": "^20.4.8",
"@types/node-fetch": "^2.6.4",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@ui5/cli": "^3.3.4",
"@ui5/ts-interface-generator": "^0.7.0",
"@wdio/cli": "^7.32.3",
"@wdio/local-runner": "^7.32.3",
"@wdio/mocha-framework": "^7.30.2",
"@wdio/spec-reporter": "^7.31.1",
"babel-preset-transform-ui5": "^7.2.4",
"chromedriver": "^115.0.0",
"conventional-changelog-cli": "^3.0.0",
"cz-conventional-changelog": "^3.3.0",
"eslint": "^8.26.0",
"husky": "^8.0.1",
"lint-staged": "^13.0.3",
"node-fetch": "^3.2.10",
"eslint": "^8.46.0",
"husky": "^8.0.3",
"lint-staged": "^13.2.3",
"node-fetch": "^3.3.2",
"npm-run-all": "^4.1.5",
"prettier": "^2.7.1",
"prettier-plugin-properties": "^0.2.0",
"pretty-quick": "^3.1.3",
"sitemap": "^7.1.1",
"typescript": "^4.8.4",
"ui5-middleware-livereload": "^0.7.0",
"ui5-tooling-modules": "^0.7.0",
"wdio-chromedriver-service": "^8.0.0",
"wdio-ui5-service": "^0.9.15",
"xml-formatter": "^2.6.1"
},
"ui5": {
"dependencies": [
"ui5-tooling-modules",
"ui5-middleware-livereload",
"ui5-cc-md"
]
"typescript": "^5.1.6",
"ui5-middleware-livereload": "^3.0.0",
"ui5-tooling-modules": "^3.0.0",
"wait-on": "^7.0.1",
"wdio-chromedriver-service": "^8.1.1",
"wdio-ui5-service": "^1.5.1",
"xml-formatter": "^3.5.0"
},
"config": {
"commitizen": {
Expand Down
2 changes: 1 addition & 1 deletion src/test/e2e/queryFilter.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ describe("ui5 query filter", () => {
try {
await $("filtekuzfutkfk424214").waitForExist({ timeout: 1000 });
} catch (error) {}
const firstItemInfolabelType = await $("#__component0---AllPackages--trend-item-type-__clone19");
const firstItemInfolabelType = await $("[id^=__component0---AllPackages--_IDGenCustomListItem1-__]");
const firstItemInfolabelTypeSpan = await firstItemInfolabelType.$(".sapTntInfoLabelText");
const infolabelInnerText = await firstItemInfolabelTypeSpan.getText();

Expand Down
4 changes: 2 additions & 2 deletions src/test/e2e/tags.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ describe("ui5 tags", () => {
const item2 = await itemsTags[2];
await item2.press(); // press the second item `task`
try {
await $("#__component0---AllPackages--trend-item-type-__clone0").waitForExist({ timeout: 1500 });
await $("#__component0---AllPackages--trend-item-type-__clone0").waitForExist({ timeout: 2000 });
} catch (error) {}
// get type infolabel
const firstItemInfolabelType = await $("#__component0---AllPackages--trend-item-type-__clone19");
const firstItemInfolabelType = await $("[id^=__component0---AllPackages--_IDGenCustomListItem1-__]");
const firstItemInfolabelTypeSpan = await firstItemInfolabelType.$(".sapTntInfoLabelText");
const infolabelInnerText = await firstItemInfolabelTypeSpan.getText();

Expand Down
4 changes: 2 additions & 2 deletions ui5-dist.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
specVersion: "2.0"
specVersion: "3.0"
metadata:
name: org.openui5.ui5community
type: application
Expand All @@ -8,7 +8,7 @@ resources:
webapp: ./docs
framework:
name: OpenUI5
version: "1.108.0"
version: "1.116.0"
libraries:
- name: sap.m
- name: sap.ui.core
Expand Down
4 changes: 2 additions & 2 deletions ui5.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
specVersion: "2.0"
specVersion: "3.0"
metadata:
name: org.openui5.ui5community
type: application
framework:
name: OpenUI5
version: "1.108.0"
version: "1.116.0"
libraries:
- name: sap.ui.core
- name: sap.ui.layout
Expand Down
3 changes: 1 addition & 2 deletions wdio.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ exports.config = {
screenshotPath: require("path").join("some", "dir", "for", "screenshots"), // [optional] {string}, default: ""
screenshotsDisabled: false, // [optional] {boolean}, default: false; if set to true, screenshots won't be taken and not written to file system
logLevel: "error", // [optional] error | verbose | silent, default: "error"
url: "mockServer.html", // [mandatory] {string} name of your bootstrap html file. If your server autoredirects to a 'domain:port/'-like root url, use empty string ''
skipInjectUI5OnStart: false, // [optional] {boolean}, default: false; true when UI5 is not on the start page, you need to later call <wdioUI5service>.injectUI5() manually
waitForUI5Timeout: 15000, // [optional] {number}, default: 15000; maximum waiting time in milliseconds while checking for UI5 availability
},
Expand Down Expand Up @@ -105,7 +104,7 @@ exports.config = {
// with `/`, the base url gets prepended, not including the path portion of your baseUrl.
// If your `url` parameter starts without a scheme or `/` (like `some/path`), the base url
// gets prepended directly.
baseUrl: "http://localhost:8080",
baseUrl: "http://localhost:8080/mockServer.html",
//
// Default timeout for all waitFor* commands.
waitforTimeout: 10000,
Expand Down

0 comments on commit 35c084f

Please sign in to comment.