@sap_oss/wdio-qmate-service 2.14.1 → 2.14.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -43,10 +43,19 @@ class Table {
43
43
  "text": "Ascending"
44
44
  }
45
45
  };
46
+ const newerSortButtonSelector = {
47
+ "elementProperties": {
48
+ "metadata": "sap.ui.core.Icon",
49
+ "src": "sap-icon://sort-ascending"
50
+ },
51
+ "ancestorProperties": {
52
+ "metadata": "sap.m.InputListItem"
53
+ }
54
+ };
46
55
  const sort = await this._getSortIndicatorValue(columnName, tableSelector);
47
56
  if (sort !== "Ascending") {
48
57
  this._clickColumn(columnName, tableSelector);
49
- await Promise.any([ui5.userInteraction.click(oldSortButtonSelector), ui5.userInteraction.click(newSortButtonSelector)]);
58
+ await Promise.any([ui5.userInteraction.click(oldSortButtonSelector), ui5.userInteraction.click(newSortButtonSelector), ui5.userInteraction.click(newerSortButtonSelector)]);
50
59
  }
51
60
  }
52
61
  /**
@@ -81,10 +90,19 @@ class Table {
81
90
  "text": "Descending"
82
91
  }
83
92
  };
93
+ const newerSortButtonSelector = {
94
+ "elementProperties": {
95
+ "metadata": "sap.ui.core.Icon",
96
+ "src": "sap-icon://sort-descending"
97
+ },
98
+ "ancestorProperties": {
99
+ "metadata": "sap.m.InputListItem"
100
+ }
101
+ };
84
102
  const sort = await this._getSortIndicatorValue(columnName, tableSelector);
85
103
  if (sort !== "Descending") {
86
104
  this._clickColumn(columnName, tableSelector);
87
- await Promise.any([ui5.userInteraction.click(oldSortButtonSelector), ui5.userInteraction.click(newSortButtonSelector)]);
105
+ await Promise.any([ui5.userInteraction.click(oldSortButtonSelector), ui5.userInteraction.click(newSortButtonSelector), ui5.userInteraction.click(newerSortButtonSelector)]);
88
106
  }
89
107
  }
90
108
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../src/reuse/modules/ui5/table.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../src/reuse/modules/ui5/table.ts"],"names":[],"mappings":"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"}
@@ -15,9 +15,14 @@ function azureGetGitRoot() {
15
15
  throw Error();
16
16
  }
17
17
  }
18
- function getGitRoot() {
18
+ function getGitRoot(configPath) {
19
19
  try {
20
- return (0, child_process_1.execSync)("git rev-parse --show-toplevel").toString().trim();
20
+ return (0, child_process_1.execSync)("git rev-parse --show-toplevel", {
21
+ cwd: configPath, // Run the command in the configPath directory to support absolute path execution
22
+ stdio: ["pipe", "pipe", "ignore"] // Ignore stderr
23
+ })
24
+ .toString()
25
+ .trim();
21
26
  }
22
27
  catch (error) {
23
28
  // Intentionally left blank
@@ -37,7 +42,7 @@ function getConfigurationHash() {
37
42
  if (process.env.CONFIG_PATH) {
38
43
  const configPath = process.env.CONFIG_PATH;
39
44
  try {
40
- const gitRoot = getGitRoot();
45
+ const gitRoot = getGitRoot(configPath);
41
46
  const relativePath = path_1.default.relative(gitRoot, configPath);
42
47
  try {
43
48
  return (0, sha_js_1.default)("sha256").update(relativePath).digest("hex");
@@ -1 +1 @@
1
- {"version":3,"file":"getConfigurationInformation.js","sourceRoot":"","sources":["../../../src/scripts/stats/getConfigurationInformation.ts"],"names":[],"mappings":";;;;;AA4BA,oDAqBC;AAjDD,iDAAyC;AACzC,oDAA2B;AAC3B,gDAAwB;AAExB,SAAS,eAAe;IACtB,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC;QAC3C,OAAO,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAA;IAC/C,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,EAAE,CAAC;IAChB,CAAC;AACH,CAAC;AAED,SAAS,UAAU;IACjB,IAAI,CAAC;QACH,OAAO,IAAA,wBAAQ,EAAC,+BAA+B,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,IAAI,CAAC;QACH,OAAO,eAAe,EAAE,CAAA;IAC1B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,MAAM,KAAK,EAAE,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB;IAClC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;IAC1D,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;IACpD,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;IAE1D,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;YAC7B,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACxD,IAAI,CAAC;gBACH,OAAO,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,oBAAoB,CAAC;QAC9B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,uBAAuB,CAAC;IACjC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"getConfigurationInformation.js","sourceRoot":"","sources":["../../../src/scripts/stats/getConfigurationInformation.ts"],"names":[],"mappings":";;;;;AAiCA,oDAqBC;AAtDD,iDAAyC;AACzC,oDAA2B;AAC3B,gDAAwB;AAExB,SAAS,eAAe;IACtB,IAAI,OAAO,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC;QAC3C,OAAO,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC;IAChD,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,EAAE,CAAC;IAChB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,UAAkB;IACpC,IAAI,CAAC;QACH,OAAO,IAAA,wBAAQ,EAAC,+BAA+B,EAAE;YAC/C,GAAG,EAAE,UAAU,EAAE,iFAAiF;YAClG,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,gBAAgB;SACnD,CAAC;aACC,QAAQ,EAAE;aACV,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,IAAI,CAAC;QACH,OAAO,eAAe,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,MAAM,KAAK,EAAE,CAAC;AAChB,CAAC;AAED,SAAgB,oBAAoB;IAClC,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;IAC1D,MAAM,oBAAoB,GAAG,sBAAsB,CAAC;IACpD,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;IAE1D,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QAC3C,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;YACvC,MAAM,YAAY,GAAG,cAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACxD,IAAI,CAAC;gBACH,OAAO,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,oBAAoB,CAAC;QAC9B,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,uBAAuB,CAAC;IACjC,CAAC;AACH,CAAC"}
@@ -14,9 +14,14 @@ function azureGetGitRemoteUrl() {
14
14
  throw Error();
15
15
  }
16
16
  }
17
- function getGitRemoteUrl() {
17
+ function getGitRemoteUrl(configPath) {
18
18
  try {
19
- return (0, child_process_1.execSync)("git config --get remote.origin.url").toString().trim();
19
+ return (0, child_process_1.execSync)("git config --get remote.origin.url", {
20
+ cwd: configPath, // Run the command in the configPath directory to support absolute path execution
21
+ stdio: ["pipe", "pipe", "ignore"] // Ignore stderr
22
+ })
23
+ .toString()
24
+ .trim();
20
25
  }
21
26
  catch (error) {
22
27
  // Intentionally left blank
@@ -33,7 +38,10 @@ function getCwdGitRemoteUrlHash() {
33
38
  const FALLBACK_NO_GIT_ORIGIN_REMOTE = "FALLBACK_NO_GIT_ORIGIN_REMOTE";
34
39
  const FALLBACK_HASHING_FAILED = "FALLBACK_HASHING_FAILED";
35
40
  try {
36
- const remoteUrl = getGitRemoteUrl();
41
+ if (!process.env.CONFIG_PATH) {
42
+ throw Error();
43
+ }
44
+ const remoteUrl = getGitRemoteUrl(process.env.CONFIG_PATH);
37
45
  try {
38
46
  const remoteUrlHash = (0, sha_js_1.default)("sha256").update(remoteUrl).digest("hex");
39
47
  return remoteUrlHash;
@@ -1 +1 @@
1
- {"version":3,"file":"getRepositoryInformation.js","sourceRoot":"","sources":["../../../src/scripts/stats/getRepositoryInformation.ts"],"names":[],"mappings":";;;;;AA2BA,wDAeC;AA1CD,iDAAyC;AACzC,oDAA2B;AAE3B,SAAS,oBAAoB;IAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAA;IACzC,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,EAAE,CAAC;IAChB,CAAC;AACH,CAAC;AAED,SAAS,eAAe;IACtB,IAAI,CAAC;QACH,OAAO,IAAA,wBAAQ,EAAC,oCAAoC,CAAC,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;IAC1E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,IAAI,CAAC;QACH,OAAO,oBAAoB,EAAE,CAAA;IAC/B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,MAAM,KAAK,EAAE,CAAC;AAChB,CAAC;AAED,SAAgB,sBAAsB;IACpC,MAAM,6BAA6B,GAAG,+BAA+B,CAAC;IACtE,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;IAE1D,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtE,OAAO,aAAa,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,uBAAuB,CAAC;QACjC,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,6BAA6B,CAAA;IACtC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"getRepositoryInformation.js","sourceRoot":"","sources":["../../../src/scripts/stats/getRepositoryInformation.ts"],"names":[],"mappings":";;;;;AAgCA,wDAkBC;AAlDD,iDAAyC;AACzC,oDAA2B;AAE3B,SAAS,oBAAoB;IAC3B,IAAI,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACrC,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAC1C,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,EAAE,CAAC;IAChB,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,UAAkB;IACzC,IAAI,CAAC;QACH,OAAO,IAAA,wBAAQ,EAAC,oCAAoC,EAAE;YACpD,GAAG,EAAE,UAAU,EAAE,iFAAiF;YAClG,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,gBAAgB;SACnD,CAAC;aACC,QAAQ,EAAE;aACV,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,IAAI,CAAC;QACH,OAAO,oBAAoB,EAAE,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,2BAA2B;IAC7B,CAAC;IAED,MAAM,KAAK,EAAE,CAAC;AAChB,CAAC;AAED,SAAgB,sBAAsB;IACpC,MAAM,6BAA6B,GAAG,+BAA+B,CAAC;IACtE,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;IAE1D,IAAI,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,KAAK,EAAE,CAAC;QAChB,CAAC;QACD,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtE,OAAO,aAAa,CAAC;QACvB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,uBAAuB,CAAC;QACjC,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,6BAA6B,CAAC;IACvC,CAAC;AACH,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sap_oss/wdio-qmate-service",
3
- "version": "2.14.1",
3
+ "version": "2.14.3",
4
4
  "author": "SAP SE",
5
5
  "types": "./@types/index.d.ts",
6
6
  "main": "./lib/index.js",
@@ -53,7 +53,7 @@
53
53
  "test:core:dataExchange:standard": "npx wdio ./test/core/dataExchange/config.js",
54
54
  "test:core:dataExchange:parallel": "npx wdio ./test/core/dataExchange/config.parallel.js",
55
55
  "test:core:dataExchange:parallelGroup": "npx wdio ./test/core/dataExchange/config.parallel.group.js",
56
- "test:core:dataExchange": "npm run test:core:dataExchange:export && npm run test:core:dataExchange:import && npm run test:core:dataExchange:standard && npm run test:core:dataExchange:parallel && npm run test:core:dataExchange:parallelGroup",
56
+ "test:core:dataExchange": "npm run test:core:dataExchange:export && npm run test:core:dataExchange:import && npm run test:core:dataExchange:parallel && npm run test:core:dataExchange:parallelGroup",
57
57
  "test:core:functional:chaining": "npx wdio ./test/core/functional/chaining/test.conf.js",
58
58
  "test:core:functional:locator": "npx wdio ./test/core/functional/locators/test.locator.conf.js",
59
59
  "test:core:functional:nativeBrowser": "npx wdio ./test/core/functional/nativeBrowser/test.conf.js",
@@ -141,7 +141,7 @@
141
141
  "query-string": "^7.1.0",
142
142
  "sha.js": "^2.4.11",
143
143
  "supertest": "^7.0.0",
144
- "undici": "^7.1.0",
144
+ "undici": "^7.2.3",
145
145
  "xlsx": "^0.18.5",
146
146
  "xml2js": "^0.6.0",
147
147
  "yargs": "^17.1.1",
@@ -39,6 +39,7 @@ const formUtils = {
39
39
  }
40
40
  },
41
41
  fillForm: async function (description, userData) {
42
+ await closeTrustArcCookiePopup();
42
43
  await ui5.element.waitForAll(this.textSelector);
43
44
  await ui5.userInteraction.fill(this.textSelector, description);
44
45
  await ui5.userInteraction.fill(this.emailSelector, userData.email);
@@ -47,6 +48,7 @@ const formUtils = {
47
48
  await ui5.userInteraction.fill(this.urlSelector, userData.website);
48
49
  },
49
50
  clearForm: async function () {
51
+ await closeTrustArcCookiePopup();
50
52
  await ui5.userInteraction.clear(this.textSelector);
51
53
  await ui5.userInteraction.clear(this.emailSelector);
52
54
  await ui5.userInteraction.clear(this.telephoneSelector);
@@ -55,6 +57,14 @@ const formUtils = {
55
57
  }
56
58
  };
57
59
 
60
+ async function closeTrustArcCookiePopup() {
61
+ const trustArcCookieButton="//button[text()='Accept All']";
62
+ try {
63
+ await nonUi5.userInteraction.click(trustArcCookieButton, 30000);
64
+ } catch (e) {
65
+ // ignore, no cookie dialog
66
+ }
67
+ }
58
68
 
59
69
  describe("Import and Export using UI", function () {
60
70
 
@@ -69,10 +79,9 @@ describe("Import and Export using UI", function () {
69
79
  // exportData: "./data/ui/export/exportedUser.json",
70
80
  // webUser : "./data/ui/export/exportedWebUser.json"
71
81
  // },
72
- it("step 1: use data loaded into myUserPrefix", async function () {
73
82
 
74
- // uses data from file pointed to by myUserPrefix
75
- // myUserPrefix: "./data/ui/user.json",
83
+ it("step 1: navigate to app", async function () {
84
+
76
85
  await ui5.navigation.navigateToApplication("", false);
77
86
  const acceptCookiesButton = {
78
87
  "elementProperties": {
@@ -83,12 +92,20 @@ describe("Import and Export using UI", function () {
83
92
  }]
84
93
  }
85
94
  };
95
+
96
+ await closeTrustArcCookiePopup();
86
97
  try {
87
98
  await ui5.userInteraction.click(acceptCookiesButton);
88
99
  } catch (e) {
89
100
  // ignore, no cookie dialog
90
101
  }
91
102
  await util.browser.switchToIframe("iframe[id='sampleFrame']");
103
+ });
104
+
105
+ it("step 2: use data loaded into myUserPrefix", async function () {
106
+
107
+ // uses data from file pointed to by myUserPrefix
108
+ // myUserPrefix: "./data/ui/user.json",
92
109
 
93
110
  const userData = browser.params.import.myUserPrefix;
94
111
  await common.assertion.expectDefined(userData);
@@ -104,7 +121,7 @@ describe("Import and Export using UI", function () {
104
121
 
105
122
  });
106
123
 
107
- it("step 2: use data loaded from file in subfolder moreDataFolder - anotherUser.json", async function () {
124
+ it("step 3: use data loaded from file in subfolder moreDataFolder - anotherUser.json", async function () {
108
125
 
109
126
  // file anotherUser.json is in subfolder "moreDataFolder" within directory pointed to by userDataFolder
110
127
  // userDataFolder: "./data/ui",
@@ -125,7 +142,7 @@ describe("Import and Export using UI", function () {
125
142
  await formUtils.clearForm();
126
143
 
127
144
  });
128
- it("step 3: use data loaded into uiUser", async function () {
145
+ it("step 4: use data loaded into uiUser", async function () {
129
146
 
130
147
  // uses data from file pointed to by reference
131
148
  // uiUser: "./data/ui/webUser.json"
@@ -143,7 +160,7 @@ describe("Import and Export using UI", function () {
143
160
 
144
161
  });
145
162
 
146
- it("step 4: export data into file pointed to by exportData param", async function () {
163
+ it("step 5: export data into file pointed to by exportData param", async function () {
147
164
 
148
165
  const dateAdded = (new Date()).toISOString();
149
166
  const userData = {
@@ -168,7 +185,7 @@ describe("Import and Export using UI", function () {
168
185
 
169
186
  });
170
187
 
171
- it("step 5: export data into file pointed to by webUser param", async function () {
188
+ it("step 6: export data into file pointed to by webUser param", async function () {
172
189
 
173
190
 
174
191
  const dateAdded = (new Date()).toISOString();