@sap_oss/wdio-qmate-service 2.5.0 → 2.5.2
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.
- package/lib/reuse/modules/common/types/date.types.d.ts +1 -1
- package/lib/reuse/modules/ui5/table.d.ts +1 -0
- package/lib/reuse/modules/ui5/table.js +33 -7
- package/lib/reuse/modules/ui5/table.js.map +1 -1
- package/lib/reuse/modules/ui5/types/mockserver.types.d.ts +1 -1
- package/lib/reuse/modules/ui5/types/ui5.types.d.ts +2 -2
- package/lib/reuse/modules/util/types/formatter.types.d.ts +1 -1
- package/package.json +4 -3
- package/test/reuse/util/data/test.data.conf.js +0 -2
- package/test/reuse/util/data/test.data.privacy.conf.js +22 -0
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { CalculateDates } from "../constants/date.constants";
|
|
2
|
-
export
|
|
2
|
+
export type CalculateDatesType = `${CalculateDates}`;
|
|
@@ -129,18 +129,33 @@ class Table {
|
|
|
129
129
|
text: name
|
|
130
130
|
}
|
|
131
131
|
};
|
|
132
|
+
const tableGridColumnSelector = {
|
|
133
|
+
elementProperties: {
|
|
134
|
+
metadata: "sap.ui.table.Column"
|
|
135
|
+
},
|
|
136
|
+
descendantProperties: {
|
|
137
|
+
text: name
|
|
138
|
+
}
|
|
139
|
+
};
|
|
132
140
|
if (!tableSelector) {
|
|
133
|
-
await ui5.userInteraction.click(tableColumnSelector)
|
|
141
|
+
await Promise.any([ui5.userInteraction.click(tableColumnSelector),
|
|
142
|
+
ui5.userInteraction.click(tableGridColumnSelector)]);
|
|
134
143
|
}
|
|
135
144
|
if (typeof tableSelector == "number") {
|
|
136
145
|
util.console.warn(`Usage of argument 'index' in function ${arguments.callee.caller.name} is deprecated. Please pass a valid table selector instead.`);
|
|
137
|
-
await ui5.userInteraction.click(tableColumnSelector, tableSelector)
|
|
146
|
+
await Promise.any([ui5.userInteraction.click(tableColumnSelector, tableSelector),
|
|
147
|
+
ui5.userInteraction.click(tableGridColumnSelector, tableSelector)]);
|
|
138
148
|
}
|
|
139
149
|
else if (typeof tableSelector === "object") {
|
|
140
|
-
|
|
141
|
-
|
|
150
|
+
await Promise.any([ui5.userInteraction.click(this._prepareAncestorSelector(tableColumnSelector, tableSelector)),
|
|
151
|
+
ui5.userInteraction.click(this._prepareAncestorSelector(tableGridColumnSelector, tableSelector))]);
|
|
142
152
|
}
|
|
143
153
|
}
|
|
154
|
+
async _getSortValudGridTable(selector, ancestor) {
|
|
155
|
+
const sortOrder = await ui5.element.getPropertyValue(selector, "sortOrder", ancestor);
|
|
156
|
+
const sorted = await ui5.element.getPropertyValue(selector, "sorted", ancestor);
|
|
157
|
+
return sorted ? sortOrder : "";
|
|
158
|
+
}
|
|
144
159
|
async _getSortIndicatorValue(name, tableSelector) {
|
|
145
160
|
const vl = this.vlf.initLog(this._getSortIndicatorValue);
|
|
146
161
|
const tableColumnSelector = {
|
|
@@ -151,16 +166,27 @@ class Table {
|
|
|
151
166
|
text: name
|
|
152
167
|
}
|
|
153
168
|
};
|
|
169
|
+
const tableGridColumnSelector = {
|
|
170
|
+
elementProperties: {
|
|
171
|
+
metadata: "sap.ui.table.Column"
|
|
172
|
+
},
|
|
173
|
+
descendantProperties: {
|
|
174
|
+
text: name
|
|
175
|
+
}
|
|
176
|
+
};
|
|
154
177
|
if (!tableSelector) {
|
|
155
|
-
return ui5.element.getPropertyValue(tableColumnSelector, "sortIndicator")
|
|
178
|
+
return Promise.any([ui5.element.getPropertyValue(tableColumnSelector, "sortIndicator"),
|
|
179
|
+
this._getSortValudGridTable(tableGridColumnSelector)]);
|
|
156
180
|
}
|
|
157
181
|
if (typeof tableSelector == "number") {
|
|
158
182
|
util.console.warn(`The usage of argument 'index' in function ${arguments.callee.caller.name} is deprecated. Please pass a valid table selector instead.`);
|
|
159
|
-
return ui5.element.getPropertyValue(tableColumnSelector, "sortIndicator", tableSelector)
|
|
183
|
+
return Promise.any([ui5.element.getPropertyValue(tableColumnSelector, "sortIndicator", tableSelector),
|
|
184
|
+
this._getSortValudGridTable(tableGridColumnSelector, tableSelector)]);
|
|
160
185
|
}
|
|
161
186
|
else if (typeof tableSelector === "object") {
|
|
162
187
|
const selector = this._prepareAncestorSelector(tableColumnSelector, tableSelector);
|
|
163
|
-
return ui5.element.getPropertyValue(
|
|
188
|
+
return Promise.any([ui5.element.getPropertyValue(this._prepareAncestorSelector(tableColumnSelector, tableSelector), "sortIndicator"),
|
|
189
|
+
this._getSortValudGridTable(this._prepareAncestorSelector(tableGridColumnSelector, tableSelector))]);
|
|
164
190
|
}
|
|
165
191
|
}
|
|
166
192
|
_prepareAncestorSelector(selector, ancestorSelector) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../src/reuse/modules/ui5/table.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,8DAAkE;AAElE;;;GAGG;AACH,MAAa,KAAK;IAAlB;QACU,QAAG,GAAG,IAAI,oCAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../../src/reuse/modules/ui5/table.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { RequestMethod } from "../constants/mockserver.constants";
|
|
2
|
-
export
|
|
2
|
+
export type RequestMethodType = `${RequestMethod}`;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export
|
|
1
|
+
export type Ui5Selector = {
|
|
2
2
|
elementProperties: any;
|
|
3
3
|
ancestorProperties?: any;
|
|
4
4
|
parentProperties?: any;
|
|
@@ -8,7 +8,7 @@ export declare type Ui5Selector = {
|
|
|
8
8
|
childProperties?: any;
|
|
9
9
|
descendantProperties?: any;
|
|
10
10
|
};
|
|
11
|
-
export
|
|
11
|
+
export type Ui5SelectorWithOptions = {
|
|
12
12
|
selector: Ui5Selector;
|
|
13
13
|
index?: number;
|
|
14
14
|
timeout?: number;
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { DateFormats } from "../constants/formatter.constants";
|
|
2
|
-
export
|
|
2
|
+
export type DateFormatsType = `${DateFormats}`;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sap_oss/wdio-qmate-service",
|
|
3
|
-
"version": "2.5.
|
|
3
|
+
"version": "2.5.2",
|
|
4
4
|
"author": "SAP SE",
|
|
5
5
|
"types": "./@types/index.d.ts",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
}
|
|
24
24
|
],
|
|
25
25
|
"scripts": {
|
|
26
|
-
"update-chromedriver": "npm install chromedriver --chromedriver-force-download --detect_chromedriver_version",
|
|
26
|
+
"update-chromedriver": "npm install chromedriver --chromedriver-force-download --detect_chromedriver_version --no-save",
|
|
27
27
|
"prepare": "npm run build",
|
|
28
28
|
"clean": "npx rimraf lib",
|
|
29
29
|
"lint": "eslint .",
|
|
@@ -91,6 +91,7 @@
|
|
|
91
91
|
"test:reuse:util:browser": "npx wdio ./test/reuse/util/browser/test.browser.conf.js",
|
|
92
92
|
"test:reuse:util:browserCmndLineArgs": "npx wdio ./test/reuse/util/browser/test.browserCmndLineArgs.conf.js --baseUrl=https://sapui5.hana.ondemand.com/1.99.0/",
|
|
93
93
|
"test:reuse:util:data": "npx wdio ./test/reuse/util/data/test.data.conf.js",
|
|
94
|
+
"test:reuse:util:data:privacy": "npx wdio ./test/reuse/util/data/test.data.privacy.conf.js",
|
|
94
95
|
"test:reuse:util:component": "npx wdio ./test/reuse/util/component/test.component.conf.js",
|
|
95
96
|
"test:reuse:util:file": "npx wdio ./test/reuse/util/file/test.file.conf.js",
|
|
96
97
|
"test:reuse:util:console": "npx wdio ./test/reuse/util/console/test.console.conf.js",
|
|
@@ -153,7 +154,7 @@
|
|
|
153
154
|
"@wdio/static-server-service": "^8.6.8",
|
|
154
155
|
"app-root-path": "^3.1.0",
|
|
155
156
|
"chai": "^4.3.4",
|
|
156
|
-
"chromedriver": "^
|
|
157
|
+
"chromedriver": "^114.0.3",
|
|
157
158
|
"concurrently": "^7.6.0",
|
|
158
159
|
"doctrine": "^3.0.0",
|
|
159
160
|
"eslint": "^6.8.0",
|
|
@@ -17,8 +17,6 @@ exports.config = merge(profile.config, {
|
|
|
17
17
|
|
|
18
18
|
specs: [
|
|
19
19
|
path.resolve(__dirname, "getData.spec.js"),
|
|
20
|
-
path.resolve(__dirname, "getSecureData.spec.js"),
|
|
21
|
-
path.resolve(__dirname, "decrypt.spec.js"),
|
|
22
20
|
path.resolve(__dirname, "readDataFromFile.spec.js"),
|
|
23
21
|
path.resolve(__dirname, "writeDataToFile.spec.js")
|
|
24
22
|
]
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
const path = require("path");
|
|
2
|
+
const merge = require("deepmerge");
|
|
3
|
+
const profile = require("../../../helper/configurations/chrome.headless.conf");
|
|
4
|
+
|
|
5
|
+
exports.config = merge(profile.config, {
|
|
6
|
+
maxInstances: 6,
|
|
7
|
+
specFileRetries: 2,
|
|
8
|
+
|
|
9
|
+
baseUrl: "https://sapui5.hana.ondemand.com/",
|
|
10
|
+
|
|
11
|
+
params: {
|
|
12
|
+
import: {
|
|
13
|
+
data: "./data/",
|
|
14
|
+
customSourceData: "./customSourceData"
|
|
15
|
+
}
|
|
16
|
+
},
|
|
17
|
+
|
|
18
|
+
specs: [
|
|
19
|
+
path.resolve(__dirname, "getSecureData.spec.js"),
|
|
20
|
+
path.resolve(__dirname, "decrypt.spec.js")
|
|
21
|
+
]
|
|
22
|
+
});
|