promod 0.0.30 → 0.0.35
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/built/swd/config/config.js +2 -2
- package/built/swd/config/config.js.map +1 -1
- package/built/swd/driver/index.js +3 -3
- package/built/swd/driver/index.js.map +1 -1
- package/built/swd/driver/remote.js +1 -1
- package/built/swd/driver/remote.js.map +1 -1
- package/built/swd/swd_client.d.ts +1 -1
- package/built/swd/swd_client.js +34 -34
- package/built/swd/swd_client.js.map +1 -1
- package/built/swd/swd_element.d.ts +1 -1
- package/built/swd/swd_element.js +9 -7
- package/built/swd/swd_element.js.map +1 -1
- package/package.json +4 -4
- package/specs/base.spec.ts +1 -2
|
@@ -8,13 +8,13 @@ const checkString = ['seleniumAddress', 'seleniumSessionId', 'baseUrl'];
|
|
|
8
8
|
function validateSeleniumConf(configObj) {
|
|
9
9
|
const configKeys = Object.keys(configObj);
|
|
10
10
|
for (const key of configKeys) {
|
|
11
|
-
if ((checkPathes.includes(key) || checkString.includes(key)) && (!sat_utils_1.isString(configObj[key]) && !sat_utils_1.isUndefined(configObj[key]))) {
|
|
11
|
+
if ((checkPathes.includes(key) || checkString.includes(key)) && (!(0, sat_utils_1.isString)(configObj[key]) && !(0, sat_utils_1.isUndefined)(configObj[key]))) {
|
|
12
12
|
throw new TypeError(`
|
|
13
13
|
config: ${key} value should be a string,
|
|
14
14
|
please use BaseConf type or visit https://github.com/Simple-Automation-Testing/promod/blob/master/lib/swd/config/config.ts
|
|
15
15
|
`);
|
|
16
16
|
}
|
|
17
|
-
if (checkPathes.includes(key) && (!sat_utils_1.isUndefined(configObj[key]) && sat_utils_1.isString(configObj[key]) && !fs.existsSync(configObj[key]))) {
|
|
17
|
+
if (checkPathes.includes(key) && (!(0, sat_utils_1.isUndefined)(configObj[key]) && (0, sat_utils_1.isString)(configObj[key]) && !fs.existsSync(configObj[key]))) {
|
|
18
18
|
throw new TypeError(`
|
|
19
19
|
config: ${key} ${configObj[key]} file does not exist
|
|
20
20
|
please use BaseConf type or visit https://github.com/Simple-Automation-Testing/promod/blob/master/lib/swd/config/config.ts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/swd/config/config.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,yBAAyB;AAEzB,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;AACzE,MAAM,WAAW,GAAG,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;AAyBxE,SAAS,oBAAoB,CAAC,SAAmB;IAChD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;QAC7B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,oBAAQ,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/swd/config/config.ts"],"names":[],"mappings":";;;AAAA,yCAAgD;AAChD,yBAAyB;AAEzB,MAAM,WAAW,GAAG,CAAC,mBAAmB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;AACzE,MAAM,WAAW,GAAG,CAAC,iBAAiB,EAAE,mBAAmB,EAAE,SAAS,CAAC,CAAC;AAyBxE,SAAS,oBAAoB,CAAC,SAAmB;IAChD,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;QAC7B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,IAAA,oBAAQ,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAA,uBAAW,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5H,MAAM,IAAI,SAAS,CAAC;UACb,GAAG;;IAET,CAAC,CAAC;SACH;QAED,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAA,uBAAW,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,IAAA,oBAAQ,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC9H,MAAM,IAAI,SAAS,CAAC;UACb,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC;;IAE3B,CAAC,CAAC;SACH;KACD;AACF,CAAC;AAGA,oDAAoB"}
|
|
@@ -16,14 +16,14 @@ async function getSeleniumDriver(config = {}, browser) {
|
|
|
16
16
|
_config = config;
|
|
17
17
|
}
|
|
18
18
|
// validate config
|
|
19
|
-
config_1.validateSeleniumConf(_config);
|
|
20
|
-
const driver = await remote_1.getDriver(_config);
|
|
19
|
+
(0, config_1.validateSeleniumConf)(_config);
|
|
20
|
+
const driver = await (0, remote_1.getDriver)(_config);
|
|
21
21
|
/**
|
|
22
22
|
* @info
|
|
23
23
|
* init creations of the new driver
|
|
24
24
|
* and init current driver
|
|
25
25
|
*/
|
|
26
|
-
_browser.setCreateNewDriver = () => remote_1.getDriver(_config);
|
|
26
|
+
_browser.setCreateNewDriver = () => (0, remote_1.getDriver)(_config);
|
|
27
27
|
_browser.setClient(driver);
|
|
28
28
|
if (config.baseUrl) {
|
|
29
29
|
_browser.baseUrl = config.baseUrl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/swd/driver/index.ts"],"names":[],"mappings":";;;AACA,qCAAmC;AAEnC,8CAAsC;AACtC,sCAA+C;AAE/C,KAAK,UAAU,iBAAiB,CAAC,SAA6B,EAAE,EAAE,OAAiB;IAClF,IAAI,OAAO,CAAC;IACZ,IAAI,QAAQ,CAAC;IAEb,IAAI,MAAM,YAAY,oBAAO,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QACxD,QAAQ,GAAG,MAAM,CAAC;QAClB,OAAO,GAAG,EAAE,CAAC;KACb;SAAM;QACN,QAAQ,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,MAAM,CAAC;KACjB;IAED,kBAAkB;IAClB,6BAAoB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/swd/driver/index.ts"],"names":[],"mappings":";;;AACA,qCAAmC;AAEnC,8CAAsC;AACtC,sCAA+C;AAE/C,KAAK,UAAU,iBAAiB,CAAC,SAA6B,EAAE,EAAE,OAAiB;IAClF,IAAI,OAAO,CAAC;IACZ,IAAI,QAAQ,CAAC;IAEb,IAAI,MAAM,YAAY,oBAAO,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QACxD,QAAQ,GAAG,MAAM,CAAC;QAClB,OAAO,GAAG,EAAE,CAAC;KACb;SAAM;QACN,QAAQ,GAAG,OAAO,CAAC;QACnB,OAAO,GAAG,MAAM,CAAC;KACjB;IAED,kBAAkB;IAClB,IAAA,6BAAoB,EAAC,OAAO,CAAC,CAAC;IAE9B,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,OAAO,CAAC,CAAC;IAExC;;;;OAIG;IAEH,QAAQ,CAAC,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAA,kBAAS,EAAC,OAAO,CAAC,CAAC;IACvD,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAE3B,IAAI,MAAM,CAAC,OAAO,EAAE;QACnB,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;KAClC;IAED,OAAO,MAAM,CAAC;AACf,CAAC;AAGA,8CAAiB"}
|
|
@@ -13,7 +13,7 @@ const getDriver = async (config) => {
|
|
|
13
13
|
return await new selenium_webdriver_1.WebDriver(config.seleniumSessionId, new _http.Executor(Promise.resolve(config.seleniumAddress)
|
|
14
14
|
.then((url) => new _http.HttpClient(url, null, null))));
|
|
15
15
|
}
|
|
16
|
-
const { seleniumAddress, capabilities = selenium_webdriver_1.Capabilities.chrome(), } = await local_1.runLocalEnv(combinedConfig);
|
|
16
|
+
const { seleniumAddress, capabilities = selenium_webdriver_1.Capabilities.chrome(), } = await (0, local_1.runLocalEnv)(combinedConfig);
|
|
17
17
|
const driver = new selenium_webdriver_1.Builder()
|
|
18
18
|
.usingServer(seleniumAddress)
|
|
19
19
|
.withCapabilities(capabilities)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../lib/swd/driver/remote.ts"],"names":[],"mappings":";;;AAAA,2DAAoE;AACpE,iDAAiD;AAEjD,mCAAoC;AAEpC,MAAM,SAAS,GAAG,KAAK,EAAE,MAAM,EAAE,EAAE;IAClC,MAAM,cAAc,GAAG,MAAM,IAAI,EAAC,YAAY,EAAE,iCAAY,CAAC,MAAM,EAAE,EAAC,CAAC;IACvE,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE;QACjC,cAAc,CAAC,YAAY,GAAG,iCAAY,CAAC,MAAM,EAAE,CAAC;KACpD;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE;QAC7B,OAAO,MAAM,IAAI,8BAAS,CACzB,MAAM,CAAC,iBAAiB,EACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;aACxD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CACvD,CAAC;KACF;IAED,MAAM,EACL,eAAe,EACf,YAAY,GAAG,iCAAY,CAAC,MAAM,EAAE,GACpC,GAAG,MAAM,mBAAW,
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../lib/swd/driver/remote.ts"],"names":[],"mappings":";;;AAAA,2DAAoE;AACpE,iDAAiD;AAEjD,mCAAoC;AAEpC,MAAM,SAAS,GAAG,KAAK,EAAE,MAAM,EAAE,EAAE;IAClC,MAAM,cAAc,GAAG,MAAM,IAAI,EAAC,YAAY,EAAE,iCAAY,CAAC,MAAM,EAAE,EAAC,CAAC;IACvE,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE;QACjC,cAAc,CAAC,YAAY,GAAG,iCAAY,CAAC,MAAM,EAAE,CAAC;KACpD;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE;QAC7B,OAAO,MAAM,IAAI,8BAAS,CACzB,MAAM,CAAC,iBAAiB,EACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC;aACxD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CACvD,CAAC;KACF;IAED,MAAM,EACL,eAAe,EACf,YAAY,GAAG,iCAAY,CAAC,MAAM,EAAE,GACpC,GAAG,MAAM,IAAA,mBAAW,EAAC,cAAc,CAAC,CAAC;IAEtC,MAAM,MAAM,GAAG,IAAI,4BAAO,EAAE;SAC1B,WAAW,CAAC,eAAe,CAAC;SAC5B,gBAAgB,CAAC,YAAY,CAAC;SAC9B,KAAK,EAAE,CAAC;IAEV,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAGD,8BAAS"}
|
|
@@ -49,11 +49,11 @@ declare class Browser {
|
|
|
49
49
|
executeAsyncScript(script: any, ...args: any[]): Promise<any>;
|
|
50
50
|
navigate(): import("selenium-webdriver").Navigation;
|
|
51
51
|
switchTo(): import("selenium-webdriver").TargetLocator;
|
|
52
|
-
private toSeleniumArgs;
|
|
53
52
|
quit(): Promise<void>;
|
|
54
53
|
quitAll(): Promise<void>;
|
|
55
54
|
close(): Promise<void>;
|
|
56
55
|
actions(): import("selenium-webdriver").Actions;
|
|
56
|
+
private toSeleniumArgs;
|
|
57
57
|
private getSeleniumProtocolElement;
|
|
58
58
|
private resolveUrl;
|
|
59
59
|
}
|
package/built/swd/swd_client.js
CHANGED
|
@@ -7,7 +7,7 @@ function validateBrowserCallMethod(browserClass) {
|
|
|
7
7
|
const protKeys = Object.getOwnPropertyNames(browserClass.prototype).filter((item) => item !== 'constructor');
|
|
8
8
|
for (const key of protKeys) {
|
|
9
9
|
const descriptor = Object.getOwnPropertyDescriptor(browserClass.prototype, key);
|
|
10
|
-
if (sat_utils_1.isAsyncFunction(descriptor.value)) {
|
|
10
|
+
if ((0, sat_utils_1.isAsyncFunction)(descriptor.value)) {
|
|
11
11
|
const originalMethod = descriptor.value;
|
|
12
12
|
// eslint-disable-next-line no-inner-declarations
|
|
13
13
|
async function decoratedWithChecker(...args) {
|
|
@@ -35,7 +35,7 @@ class Browser {
|
|
|
35
35
|
return this.seleniumDriver;
|
|
36
36
|
}
|
|
37
37
|
async runNewBrowser() {
|
|
38
|
-
if (!sat_utils_1.isArray(this.drivers)) {
|
|
38
|
+
if (!(0, sat_utils_1.isArray)(this.drivers)) {
|
|
39
39
|
this.drivers = [];
|
|
40
40
|
}
|
|
41
41
|
this.drivers.push(this.seleniumDriver);
|
|
@@ -47,11 +47,11 @@ class Browser {
|
|
|
47
47
|
this.seleniumDriver = newDriver;
|
|
48
48
|
}
|
|
49
49
|
async switchToBrowser({ index, tabTitle } = {}) {
|
|
50
|
-
if (sat_utils_1.isNumber(index) && sat_utils_1.isArray(this.drivers) && this.drivers.length > index) {
|
|
50
|
+
if ((0, sat_utils_1.isNumber)(index) && (0, sat_utils_1.isArray)(this.drivers) && this.drivers.length > index) {
|
|
51
51
|
this.seleniumDriver = this.drivers[index];
|
|
52
52
|
return;
|
|
53
53
|
}
|
|
54
|
-
if (sat_utils_1.isString(tabTitle)) {
|
|
54
|
+
if ((0, sat_utils_1.isString)(tabTitle)) {
|
|
55
55
|
for (const driver of this.drivers) {
|
|
56
56
|
const result = await this.switchToBrowserTab({ title: tabTitle }).then(() => true, () => false).catch(() => false);
|
|
57
57
|
if (result) {
|
|
@@ -112,15 +112,15 @@ class Browser {
|
|
|
112
112
|
async switchToBrowserTab(tabObject) {
|
|
113
113
|
const { index, expectedQuantity, title, timeout = 5000 } = tabObject;
|
|
114
114
|
let tabs = await this.getTabs();
|
|
115
|
-
if (sat_utils_1.isNumber(expectedQuantity)) {
|
|
116
|
-
await sat_utils_1.waitForCondition(async () => {
|
|
115
|
+
if ((0, sat_utils_1.isNumber)(expectedQuantity)) {
|
|
116
|
+
await (0, sat_utils_1.waitForCondition)(async () => {
|
|
117
117
|
tabs = await this.getTabs();
|
|
118
118
|
return tabs.length === expectedQuantity;
|
|
119
119
|
}, { message: `Couldn't wait for ${expectedQuantity} tab(s) to appear. Probably you should pass expectedQuantity`, timeout });
|
|
120
120
|
}
|
|
121
121
|
if (tabs.length > 1) {
|
|
122
122
|
if (title) {
|
|
123
|
-
await sat_utils_1.waitForCondition(async () => {
|
|
123
|
+
await (0, sat_utils_1.waitForCondition)(async () => {
|
|
124
124
|
tabs = await this.getTabs();
|
|
125
125
|
for (const tab of tabs) {
|
|
126
126
|
await this.switchTo().window(tab);
|
|
@@ -192,32 +192,6 @@ class Browser {
|
|
|
192
192
|
switchTo() {
|
|
193
193
|
return this.seleniumDriver.switchTo();
|
|
194
194
|
}
|
|
195
|
-
async toSeleniumArgs(...args) {
|
|
196
|
-
const executeScriptArgs = [];
|
|
197
|
-
for (const item of args) {
|
|
198
|
-
const resolvedItem = sat_utils_1.isPromise(item) ? await item : item;
|
|
199
|
-
if (Array.isArray(resolvedItem)) {
|
|
200
|
-
const arrayItems = [];
|
|
201
|
-
for (const itemArr of resolvedItem) {
|
|
202
|
-
if (item && item.getId) {
|
|
203
|
-
const elementObj = await this.getSeleniumProtocolElement(itemArr);
|
|
204
|
-
arrayItems.push(elementObj);
|
|
205
|
-
}
|
|
206
|
-
else {
|
|
207
|
-
arrayItems.push(itemArr);
|
|
208
|
-
}
|
|
209
|
-
}
|
|
210
|
-
executeScriptArgs.push(arrayItems);
|
|
211
|
-
}
|
|
212
|
-
else if (resolvedItem && resolvedItem.getSeleniumProtocolElementObj) {
|
|
213
|
-
executeScriptArgs.push(await resolvedItem.getSeleniumProtocolElementObj());
|
|
214
|
-
}
|
|
215
|
-
else {
|
|
216
|
-
executeScriptArgs.push(item);
|
|
217
|
-
}
|
|
218
|
-
}
|
|
219
|
-
return executeScriptArgs;
|
|
220
|
-
}
|
|
221
195
|
async quit() {
|
|
222
196
|
if (this.drivers && this.drivers.length) {
|
|
223
197
|
const index = this.drivers.findIndex((driver) => driver === this.seleniumDriver);
|
|
@@ -228,7 +202,7 @@ class Browser {
|
|
|
228
202
|
this.seleniumDriver = null;
|
|
229
203
|
}
|
|
230
204
|
async quitAll() {
|
|
231
|
-
if (sat_utils_1.isArray(this.drivers) && this.drivers.length) {
|
|
205
|
+
if ((0, sat_utils_1.isArray)(this.drivers) && this.drivers.length) {
|
|
232
206
|
for (const driver of this.drivers) {
|
|
233
207
|
if (this.seleniumDriver === driver) {
|
|
234
208
|
this.seleniumDriver = null;
|
|
@@ -248,6 +222,32 @@ class Browser {
|
|
|
248
222
|
actions() {
|
|
249
223
|
return this.seleniumDriver.actions({ async: true });
|
|
250
224
|
}
|
|
225
|
+
async toSeleniumArgs(...args) {
|
|
226
|
+
const executeScriptArgs = [];
|
|
227
|
+
for (const item of args) {
|
|
228
|
+
const resolvedItem = (0, sat_utils_1.isPromise)(item) ? await item : item;
|
|
229
|
+
if (Array.isArray(resolvedItem)) {
|
|
230
|
+
const arrayItems = [];
|
|
231
|
+
for (const itemArr of resolvedItem) {
|
|
232
|
+
if (item && item.getId) {
|
|
233
|
+
const elementObj = await this.getSeleniumProtocolElement(itemArr);
|
|
234
|
+
arrayItems.push(elementObj);
|
|
235
|
+
}
|
|
236
|
+
else {
|
|
237
|
+
arrayItems.push(itemArr);
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
executeScriptArgs.push(arrayItems);
|
|
241
|
+
}
|
|
242
|
+
else if (resolvedItem && resolvedItem.getSeleniumProtocolElementObj) {
|
|
243
|
+
executeScriptArgs.push(await resolvedItem.getSeleniumProtocolElementObj());
|
|
244
|
+
}
|
|
245
|
+
else {
|
|
246
|
+
executeScriptArgs.push(item);
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
return executeScriptArgs;
|
|
250
|
+
}
|
|
251
251
|
async getSeleniumProtocolElement(item) {
|
|
252
252
|
const webElId = await item.getId();
|
|
253
253
|
const elementObj = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swd_client.js","sourceRoot":"","sources":["../../lib/swd/swd_client.ts"],"names":[],"mappings":";;;AAAA,yCAAoG;AACpG,2DAAkD;AAElD,SAAS,yBAAyB,CAAC,YAAY;IAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;IAC7G,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC3B,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAChF,IAAI,2BAAe,
|
|
1
|
+
{"version":3,"file":"swd_client.js","sourceRoot":"","sources":["../../lib/swd/swd_client.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ declare class PromodSeleniumElement {
|
|
|
29
29
|
private useParent;
|
|
30
30
|
parentSelector: string;
|
|
31
31
|
constructor(selector: any, client: any, getParent?: any, getExecuteScriptArgs?: any, useParent?: any);
|
|
32
|
-
setseleniumDriver(client:
|
|
32
|
+
setseleniumDriver(client: WebDriver): void;
|
|
33
33
|
$(selector: any): PromodSeleniumElementType;
|
|
34
34
|
$$(selector: any): PromodSeleniumElementsType;
|
|
35
35
|
getSeleniumProtocolElementObj(): Promise<{
|
package/built/swd/swd_element.js
CHANGED
|
@@ -17,17 +17,17 @@ const buildBy = (selector, getExecuteScriptArgs) => {
|
|
|
17
17
|
if (selector instanceof selenium_webdriver_1.By) {
|
|
18
18
|
return selector;
|
|
19
19
|
}
|
|
20
|
-
getExecuteScriptArgs = sat_utils_1.isFunction(getExecuteScriptArgs) ? getExecuteScriptArgs : () => ([]);
|
|
21
|
-
if (sat_utils_1.isString(selector) && selector.includes('xpath=')) {
|
|
20
|
+
getExecuteScriptArgs = (0, sat_utils_1.isFunction)(getExecuteScriptArgs) ? getExecuteScriptArgs : () => ([]);
|
|
21
|
+
if ((0, sat_utils_1.isString)(selector) && selector.includes('xpath=')) {
|
|
22
22
|
return selenium_webdriver_1.By.xpath(selector.replace('xpath=', ''));
|
|
23
23
|
}
|
|
24
|
-
else if (sat_utils_1.isString(selector) && selector.includes('js=')) {
|
|
24
|
+
else if ((0, sat_utils_1.isString)(selector) && selector.includes('js=')) {
|
|
25
25
|
return selenium_webdriver_1.By.js(selector.replace('js=', ''), ...getExecuteScriptArgs());
|
|
26
26
|
}
|
|
27
|
-
else if (sat_utils_1.isPromise(selector)) {
|
|
27
|
+
else if ((0, sat_utils_1.isPromise)(selector)) {
|
|
28
28
|
return selector;
|
|
29
29
|
}
|
|
30
|
-
else if (sat_utils_1.isFunction(selector)) {
|
|
30
|
+
else if ((0, sat_utils_1.isFunction)(selector)) {
|
|
31
31
|
return selenium_webdriver_1.By.js(selector, ...getExecuteScriptArgs());
|
|
32
32
|
}
|
|
33
33
|
return selenium_webdriver_1.By.css(selector);
|
|
@@ -236,9 +236,11 @@ function getInitElementRest(selector, root, ...rest) {
|
|
|
236
236
|
* @info
|
|
237
237
|
* in case if selector is string with "js=" marker or selector is a function
|
|
238
238
|
*/
|
|
239
|
-
if ((sat_utils_1.isString(selector) && selector.indexOf('js=') === 0) || sat_utils_1.isFunction(selector) || sat_utils_1.isPromise(selector)) {
|
|
239
|
+
if (((0, sat_utils_1.isString)(selector) && selector.indexOf('js=') === 0) || (0, sat_utils_1.isFunction)(selector) || (0, sat_utils_1.isPromise)(selector)) {
|
|
240
240
|
getExecuteScriptArgs = function getExecuteScriptArgs() {
|
|
241
|
-
|
|
241
|
+
const localRest = rest.map((item) => item && item.getWebDriverElement ? item.getWebDriverElement() : item);
|
|
242
|
+
const rootPromiseIfRequired = root && root.getWebDriverElement ? root.getWebDriverElement() : root;
|
|
243
|
+
return [rootPromiseIfRequired, ...localRest];
|
|
242
244
|
};
|
|
243
245
|
}
|
|
244
246
|
else if (root && root instanceof PromodSeleniumElement) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swd_element.js","sourceRoot":"","sources":["../../lib/swd/swd_element.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,yCAAqE;AACrE,2DAA6D;
|
|
1
|
+
{"version":3,"file":"swd_element.js","sourceRoot":"","sources":["../../lib/swd/swd_element.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "promod",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.35",
|
|
4
4
|
"description": "Library for automation testing",
|
|
5
5
|
"main": "./built/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -47,9 +47,9 @@
|
|
|
47
47
|
"automation testing"
|
|
48
48
|
],
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@types/selenium-webdriver": "
|
|
51
|
-
"sat-utils": "
|
|
50
|
+
"@types/selenium-webdriver": "4.0.17",
|
|
51
|
+
"sat-utils": "0.0.37",
|
|
52
52
|
"selenium-standalone": "^7.1.0",
|
|
53
|
-
"selenium-webdriver": "
|
|
53
|
+
"selenium-webdriver": "4.1.1"
|
|
54
54
|
}
|
|
55
55
|
}
|
package/specs/base.spec.ts
CHANGED
|
@@ -44,13 +44,12 @@ describe('Base', () => {
|
|
|
44
44
|
expect(await pass.isDisplayed()).toEqual(true);
|
|
45
45
|
});
|
|
46
46
|
|
|
47
|
-
it
|
|
47
|
+
it('element click/sendKeys', async () => {
|
|
48
48
|
const email = $('input[placeholder="Ім\'я користувача"]');
|
|
49
49
|
const pass = $('input[placeholder="пароль"]');
|
|
50
50
|
const signIn = $('.login_form .btn-primary');
|
|
51
51
|
await browser.actions().keyDown(Key.SHIFT).perform();
|
|
52
52
|
await email.sendKeys(`${Key.SHIFT}a`);
|
|
53
|
-
await browser.sleep(12000);
|
|
54
53
|
await signIn.click(true);
|
|
55
54
|
});
|
|
56
55
|
|