promod 0.0.36 → 0.0.37
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 +7 -2
- package/built/swd/config/config.js.map +1 -1
- package/built/swd/driver/local.d.ts +1 -1
- package/built/swd/driver/local.js.map +1 -1
- package/built/swd/driver/remote.d.ts +1 -1
- package/built/swd/driver/remote.js +4 -7
- package/built/swd/driver/remote.js.map +1 -1
- package/built/swd/swd_client.d.ts +1 -1
- package/built/swd/swd_client.js +10 -6
- package/built/swd/swd_client.js.map +1 -1
- package/built/swd/swd_element.js +30 -12
- package/built/swd/swd_element.js.map +1 -1
- package/package.json +5 -4
- package/specs/example.spec.ts +15 -0
|
@@ -8,13 +8,18 @@ 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)) &&
|
|
11
|
+
if ((checkPathes.includes(key) || checkString.includes(key)) &&
|
|
12
|
+
!(0, sat_utils_1.isString)(configObj[key]) &&
|
|
13
|
+
!(0, sat_utils_1.isUndefined)(configObj[key])) {
|
|
12
14
|
throw new TypeError(`
|
|
13
15
|
config: ${key} value should be a string,
|
|
14
16
|
please use BaseConf type or visit https://github.com/Simple-Automation-Testing/promod/blob/master/lib/swd/config/config.ts
|
|
15
17
|
`);
|
|
16
18
|
}
|
|
17
|
-
if (checkPathes.includes(key) &&
|
|
19
|
+
if (checkPathes.includes(key) &&
|
|
20
|
+
!(0, sat_utils_1.isUndefined)(configObj[key]) &&
|
|
21
|
+
(0, sat_utils_1.isString)(configObj[key]) &&
|
|
22
|
+
!fs.existsSync(configObj[key])) {
|
|
18
23
|
throw new TypeError(`
|
|
19
24
|
config: ${key} ${configObj[key]} file does not exist
|
|
20
25
|
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,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/swd/config/config.ts"],"names":[],"mappings":";;;AAAA,yCAAkD;AAClD,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;IAC/C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE;QAC5B,IACE,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACxD,CAAC,IAAA,oBAAQ,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC,IAAA,uBAAW,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAC5B;YACA,MAAM,IAAI,SAAS,CAAC;UAChB,GAAG;;IAET,CAAC,CAAC;SACD;QAED,IACE,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;YACzB,CAAC,IAAA,uBAAW,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAA,oBAAQ,EAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACxB,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAC9B;YACA,MAAM,IAAI,SAAS,CAAC;UAChB,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC;;IAE3B,CAAC,CAAC;SACD;KACF;AACH,CAAC;AAEQ,oDAAoB"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
declare const runLocalEnv: (config: any) => Promise<any>;
|
|
2
|
-
export { runLocalEnv
|
|
2
|
+
export { runLocalEnv };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../lib/swd/driver/local.ts"],"names":[],"mappings":";;;AAAA,yBAAyB;AACzB,2EAA2E;AAC3E,kFAAkF;AAElF,
|
|
1
|
+
{"version":3,"file":"local.js","sourceRoot":"","sources":["../../../lib/swd/driver/local.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,14 +10,11 @@ const getDriver = async (config) => {
|
|
|
10
10
|
combinedConfig.capabilities = selenium_webdriver_1.Capabilities.chrome();
|
|
11
11
|
}
|
|
12
12
|
if (config.seleniumSessionId) {
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
const driver = await new selenium_webdriver_1.WebDriver(config.seleniumSessionId, new _http.Executor(Promise.resolve(config.seleniumAddress).then((url) => new _http.HttpClient(url, null, null))));
|
|
14
|
+
return driver;
|
|
15
15
|
}
|
|
16
|
-
const { seleniumAddress, capabilities = selenium_webdriver_1.Capabilities.chrome()
|
|
17
|
-
const driver = new selenium_webdriver_1.Builder()
|
|
18
|
-
.usingServer(seleniumAddress)
|
|
19
|
-
.withCapabilities(capabilities)
|
|
20
|
-
.build();
|
|
16
|
+
const { seleniumAddress, capabilities = selenium_webdriver_1.Capabilities.chrome() } = await (0, local_1.runLocalEnv)(combinedConfig);
|
|
17
|
+
const driver = new selenium_webdriver_1.Builder().usingServer(seleniumAddress).withCapabilities(capabilities).build();
|
|
21
18
|
return driver;
|
|
22
19
|
};
|
|
23
20
|
exports.getDriver = getDriver;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../lib/swd/driver/remote.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"remote.js","sourceRoot":"","sources":["../../../lib/swd/driver/remote.ts"],"names":[],"mappings":";;;AAAA,2DAAsE;AACtE,iDAAiD;AAEjD,mCAAsC;AAEtC,MAAM,SAAS,GAAG,KAAK,EAAE,MAAM,EAAE,EAAE;IACjC,MAAM,cAAc,GAAG,MAAM,IAAI,EAAE,YAAY,EAAE,iCAAY,CAAC,MAAM,EAAE,EAAE,CAAC;IACzE,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE;QAChC,cAAc,CAAC,YAAY,GAAG,iCAAY,CAAC,MAAM,EAAE,CAAC;KACrD;IAED,IAAI,MAAM,CAAC,iBAAiB,EAAE;QAC5B,MAAM,MAAM,GAAG,MAAM,IAAI,8BAAS,CAChC,MAAM,CAAC,iBAAiB,EACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CACjH,CAAC;QAEF,OAAO,MAAM,CAAC;KACf;IAED,MAAM,EAAE,eAAe,EAAE,YAAY,GAAG,iCAAY,CAAC,MAAM,EAAE,EAAE,GAAG,MAAM,IAAA,mBAAW,EAAC,cAAc,CAAC,CAAC;IAEpG,MAAM,MAAM,GAAG,IAAI,4BAAO,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC,KAAK,EAAE,CAAC;IAEjG,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEO,8BAAS"}
|
package/built/swd/swd_client.js
CHANGED
|
@@ -53,7 +53,9 @@ class Browser {
|
|
|
53
53
|
}
|
|
54
54
|
if ((0, sat_utils_1.isString)(tabTitle)) {
|
|
55
55
|
for (const driver of this.drivers) {
|
|
56
|
-
const result = await this.switchToBrowserTab({ title: tabTitle })
|
|
56
|
+
const result = await this.switchToBrowserTab({ title: tabTitle })
|
|
57
|
+
.then(() => true, () => false)
|
|
58
|
+
.catch(() => false);
|
|
57
59
|
if (result) {
|
|
58
60
|
this.seleniumDriver = driver;
|
|
59
61
|
return;
|
|
@@ -99,7 +101,7 @@ class Browser {
|
|
|
99
101
|
await this.makeActionAtEveryTab(async () => this.close(), handles);
|
|
100
102
|
}
|
|
101
103
|
async makeActionAtEveryTab(action, handles) {
|
|
102
|
-
handles = handles || await this.getTabs();
|
|
104
|
+
handles = handles || (await this.getTabs());
|
|
103
105
|
for (const windowHandle of handles) {
|
|
104
106
|
await this.switchTo().window(windowHandle);
|
|
105
107
|
await action();
|
|
@@ -119,7 +121,10 @@ class Browser {
|
|
|
119
121
|
await (0, sat_utils_1.waitForCondition)(async () => {
|
|
120
122
|
tabs = await this.getTabs();
|
|
121
123
|
return tabs.length === expectedQuantity;
|
|
122
|
-
}, {
|
|
124
|
+
}, {
|
|
125
|
+
message: `Couldn't wait for ${expectedQuantity} tab(s) to appear. Probably you should pass expectedQuantity`,
|
|
126
|
+
timeout,
|
|
127
|
+
});
|
|
123
128
|
}
|
|
124
129
|
if (tabs.length > 1) {
|
|
125
130
|
if (title) {
|
|
@@ -127,7 +132,7 @@ class Browser {
|
|
|
127
132
|
tabs = await this.getTabs();
|
|
128
133
|
for (const tab of tabs) {
|
|
129
134
|
await this.switchTo().window(tab);
|
|
130
|
-
if (await this.getTitle() === title) {
|
|
135
|
+
if ((await this.getTitle()) === title) {
|
|
131
136
|
return true;
|
|
132
137
|
}
|
|
133
138
|
}
|
|
@@ -167,8 +172,7 @@ class Browser {
|
|
|
167
172
|
return await this.seleniumDriver.get(getUrl);
|
|
168
173
|
}
|
|
169
174
|
async setWindowSize(width, height) {
|
|
170
|
-
return await this.seleniumDriver.manage().window()
|
|
171
|
-
.setRect({
|
|
175
|
+
return await this.seleniumDriver.manage().window().setRect({
|
|
172
176
|
width,
|
|
173
177
|
height,
|
|
174
178
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swd_client.js","sourceRoot":"","sources":["../../lib/swd/swd_client.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"swd_client.js","sourceRoot":"","sources":["../../lib/swd/swd_client.ts"],"names":[],"mappings":";;;AAAA,yCAAsG;AACtG,2DAAoD;AAEpD,SAAS,yBAAyB,CAAC,YAAY;IAC7C,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;QAC1B,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAChF,IAAI,IAAA,2BAAe,EAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACrC,MAAM,cAAc,GAAqC,UAAU,CAAC,KAAK,CAAC;YAE1E,iDAAiD;YACjD,KAAK,UAAU,oBAAoB,CAAC,GAAG,IAAI;gBACzC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;oBACxB,MAAM,IAAI,KAAK,CAAC;EACxB,GAAG;;MAEC,CAAC,CAAC;iBACC;gBAED,OAAO,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,CAAC;YAC5C,CAAC;YAED,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;YAEpE,UAAU,CAAC,KAAK,GAAG,oBAAoB,CAAC;YACxC,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;SAChE;KACF;IACD,OAAO,IAAI,YAAY,EAAE,CAAC;AAC5B,CAAC;AAUD,MAAM,OAAO;IAQX;QAPO,SAAI,GAAG,4BAAgB,CAAC;QAQ7B,IAAI,CAAC,IAAI,GAAG,4BAAgB,CAAC;IAC/B,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,cAAc,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC,IAAA,mBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC1B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;SACnB;QACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACvC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;SACtF;QAED,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAChD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,QAAQ,KAA4C,EAAE;QACnF,IAAI,IAAA,oBAAQ,EAAC,KAAK,CAAC,IAAI,IAAA,mBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,KAAK,EAAE;YAC3E,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,OAAO;SACR;QACD,IAAI,IAAA,oBAAQ,EAAC,QAAQ,CAAC,EAAE;YACtB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;gBACjC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;qBAC9D,IAAI,CACH,GAAG,EAAE,CAAC,IAAI,EACV,GAAG,EAAE,CAAC,KAAK,CACZ;qBACA,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;gBACtB,IAAI,MAAM,EAAE;oBACV,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;oBAC7B,OAAO;iBACR;aACF;SACF;QAED,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IAED,IAAI,kBAAkB,CAAC,aAAa;QAClC,IAAI,CAAC,gBAAgB,GAAG,aAAa,CAAC;IACxC,CAAC;IAED,SAAS,CAAC,MAAM;QACd,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IAC/B,CAAC;IAED,IAAI,GAAG;QACL,OAAO,wBAAG,CAAC;IACb,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,IAAI,OAAO,CAAC,GAAG;QACb,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;IACxB,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC7B,iCAAiC;QACjC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO;SACR;QACD,MAAM,IAAI,CAAC,yBAAyB,EAAE,CAAC;QACvC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC9C,iDAAiD;QACjD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,SAAsB;QAC7C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;SAC9C;QACD,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;IAEO,KAAK,CAAC,yBAAyB;QACrC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACpD,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,oBAAoB,CAAC,MAAsC,EAAE,OAAkB;QAC1F,OAAO,GAAG,OAAO,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5C,KAAK,MAAM,YAAY,IAAI,OAAO,EAAE;YAClC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC3C,MAAM,MAAM,EAAE,CAAC;SAChB;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,kBAAkB,CAAC,SAAsB;QACrD,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC;QAC5E,IAAI,KAAK,EAAE;YACT,OAAO,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC5C;QACD,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,IAAA,oBAAQ,EAAC,gBAAgB,CAAC,EAAE;YAC9B,MAAM,IAAA,4BAAgB,EACpB,KAAK,IAAI,EAAE;gBACT,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC5B,OAAO,IAAI,CAAC,MAAM,KAAK,gBAAgB,CAAC;YAC1C,CAAC,EACD;gBACE,OAAO,EAAE,qBAAqB,gBAAgB,8DAA8D;gBAC5G,OAAO;aACR,CACF,CAAC;SACH;QAED,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,IAAI,KAAK,EAAE;gBACT,MAAM,IAAA,4BAAgB,EACpB,KAAK,IAAI,EAAE;oBACT,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBAC5B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;wBACtB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;wBAClC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,KAAK,EAAE;4BACrC,OAAO,IAAI,CAAC;yBACb;qBACF;gBACH,CAAC,EACD,EAAE,OAAO,EAAE,eAAe,KAAK,+BAA+B,OAAO,GAAG,EAAE,OAAO,EAAE,CACpF,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;aAC3C;SACF;aAAM;YACL,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;SACvC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,EAAE,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAEpC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAa,EAAE,MAAc;QAC/C,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC;YACzD,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAY;QACtB,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAW,EAAE,GAAG,IAAW;QAC7C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC;QAE/E,OAAO,GAAG,CAAC;IACb,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,MAAW,EAAE,GAAG,IAAW;QAClD,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,CAAC;QAE1D,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC;QAEpF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACvC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,IAAI,CAAC,cAAc,CAAC,CAAC;YACjF,IAAI,KAAK,KAAK,CAAC,CAAC;gBAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;SACjD;QACD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,IAAA,mBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAChD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;gBACjC,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM,EAAE;oBAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;iBAC5B;gBACD,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;QACD,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,cAAc,EAAE;YACvB,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;SAC5B;IACH,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IACpC,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,GAAG,IAAI;QAClC,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAE7B,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;YACvB,MAAM,YAAY,GAAG,IAAA,qBAAS,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAEzD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;gBAC/B,MAAM,UAAU,GAAG,EAAE,CAAC;gBAEtB,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;oBAClC,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;wBACtB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC;wBAElE,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBAC7B;yBAAM;wBACL,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;qBAC1B;iBACF;gBACD,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACpC;iBAAM,IAAI,YAAY,IAAI,YAAY,CAAC,6BAA6B,EAAE;gBACrE,iBAAiB,CAAC,IAAI,CAAC,MAAM,YAAY,CAAC,6BAA6B,EAAE,CAAC,CAAC;aAC5E;iBAAM;gBACL,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;SACF;QAED,OAAO,iBAAiB,CAAC;IAC3B,CAAC;IAEO,KAAK,CAAC,0BAA0B,CAAC,IAAI;QAC3C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnC,MAAM,UAAU,GAAG;YACjB,qCAAqC,EAAE,OAAO;YAC9C,OAAO,EAAE,OAAO;SACjB,CAAC;QAEF,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,UAAU,CAAC,SAAiB;QAClC,IAAI,QAAQ,CAAC;QAEb,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;YAClD,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;YAC5B,MAAM,IAAI,GAAG,SAAS,CAAC;YAEvB,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAC7C,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC;aAC/C;iBAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACrD,QAAQ,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;aAC5B;iBAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACrD,QAAQ,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;aAC5B;iBAAM;gBACL,QAAQ,GAAG,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;aAC7B;SACF;aAAM,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,KAAK,GAAG,EAAE;YAChD,OAAO,IAAI,CAAC,OAAO,CAAC;SACrB;aAAM;YACL,QAAQ,GAAG,SAAS,CAAC;SACtB;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAIiB,0BAAO;AAFzB,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;AAE1C,0BAAO"}
|
package/built/swd/swd_element.js
CHANGED
|
@@ -17,7 +17,7 @@ const buildBy = (selector, getExecuteScriptArgs) => {
|
|
|
17
17
|
if (selector instanceof selenium_webdriver_1.By) {
|
|
18
18
|
return selector;
|
|
19
19
|
}
|
|
20
|
-
getExecuteScriptArgs = (0, sat_utils_1.isFunction)(getExecuteScriptArgs) ? getExecuteScriptArgs : () =>
|
|
20
|
+
getExecuteScriptArgs = (0, sat_utils_1.isFunction)(getExecuteScriptArgs) ? getExecuteScriptArgs : () => [];
|
|
21
21
|
if ((0, sat_utils_1.isString)(selector) && selector.includes('xpath=')) {
|
|
22
22
|
return selenium_webdriver_1.By.xpath(selector.replace('xpath=', ''));
|
|
23
23
|
}
|
|
@@ -33,8 +33,19 @@ const buildBy = (selector, getExecuteScriptArgs) => {
|
|
|
33
33
|
return selenium_webdriver_1.By.css(selector);
|
|
34
34
|
};
|
|
35
35
|
const SELENIUM_API_METHODS = [
|
|
36
|
-
'sendKeys',
|
|
37
|
-
'
|
|
36
|
+
'sendKeys',
|
|
37
|
+
'getTagName',
|
|
38
|
+
'getCssValue',
|
|
39
|
+
'getAttribute',
|
|
40
|
+
'getText',
|
|
41
|
+
'getRect',
|
|
42
|
+
'isEnabled',
|
|
43
|
+
'isSelected',
|
|
44
|
+
'submit',
|
|
45
|
+
'clear',
|
|
46
|
+
'getId',
|
|
47
|
+
'takeScreenshot',
|
|
48
|
+
'getLocation',
|
|
38
49
|
];
|
|
39
50
|
class PromodSeleniumElements {
|
|
40
51
|
constructor(selector, client, getParent, getExecuteScriptArgs) {
|
|
@@ -89,7 +100,7 @@ class PromodSeleniumElements {
|
|
|
89
100
|
async each(cb) {
|
|
90
101
|
await this.getElement(0);
|
|
91
102
|
for (let i = 0; i < this.wdElements.length; i++) {
|
|
92
|
-
await cb(
|
|
103
|
+
await cb(this.get(i), i);
|
|
93
104
|
}
|
|
94
105
|
}
|
|
95
106
|
async count() {
|
|
@@ -137,9 +148,10 @@ class PromodSeleniumElement {
|
|
|
137
148
|
async click(withScroll) {
|
|
138
149
|
await this.getElement();
|
|
139
150
|
if (withScroll) {
|
|
140
|
-
const scrollableClickResult = await this.wdElement
|
|
141
|
-
.
|
|
142
|
-
.catch((err) =>
|
|
151
|
+
const scrollableClickResult = await this.wdElement
|
|
152
|
+
.click()
|
|
153
|
+
.catch((err) => this.isInteractionIntercepted(err) ? this.scrollIntoView('end').then(() => this.wdElement.click()) : err)
|
|
154
|
+
.catch((err) => this.isInteractionIntercepted(err) ? this.scrollIntoView('start').then(() => this.wdElement.click()) : err)
|
|
143
155
|
.then((err) => err)
|
|
144
156
|
.catch((err) => err);
|
|
145
157
|
if (scrollableClickResult) {
|
|
@@ -165,7 +177,7 @@ class PromodSeleniumElement {
|
|
|
165
177
|
async getElement() {
|
|
166
178
|
this.seleniumDriver = swd_client_1.browser.currentClient();
|
|
167
179
|
if (this.getParent) {
|
|
168
|
-
let parent = await this.getParent();
|
|
180
|
+
let parent = (await this.getParent());
|
|
169
181
|
if (!parent) {
|
|
170
182
|
throw new Error(this.useParent
|
|
171
183
|
? `Any element with selector ${this.selector} was not found`
|
|
@@ -193,7 +205,9 @@ class PromodSeleniumElement {
|
|
|
193
205
|
* const buttonIsDisplayed = await button.isDisplayed();
|
|
194
206
|
*/
|
|
195
207
|
async isDisplayed() {
|
|
196
|
-
return this.getElement()
|
|
208
|
+
return this.getElement()
|
|
209
|
+
.then(() => this.wdElement.isDisplayed())
|
|
210
|
+
.catch(() => false);
|
|
197
211
|
}
|
|
198
212
|
/**
|
|
199
213
|
* @returns {Promise<boolean>} button is present
|
|
@@ -202,7 +216,9 @@ class PromodSeleniumElement {
|
|
|
202
216
|
* const buttonIsPresent = await button.isPresent();
|
|
203
217
|
*/
|
|
204
218
|
async isPresent() {
|
|
205
|
-
return this.getElement()
|
|
219
|
+
return this.getElement()
|
|
220
|
+
.then(() => true)
|
|
221
|
+
.catch((r) => false);
|
|
206
222
|
}
|
|
207
223
|
async callElementAction(action) {
|
|
208
224
|
await this.getElement();
|
|
@@ -236,9 +252,11 @@ function getInitElementRest(selector, root, ...rest) {
|
|
|
236
252
|
* @info
|
|
237
253
|
* in case if selector is string with "js=" marker or selector is a function
|
|
238
254
|
*/
|
|
239
|
-
if (((0, sat_utils_1.isString)(selector) && selector.indexOf('js=') === 0) ||
|
|
255
|
+
if (((0, sat_utils_1.isString)(selector) && selector.indexOf('js=') === 0) ||
|
|
256
|
+
(0, sat_utils_1.isFunction)(selector) ||
|
|
257
|
+
(0, sat_utils_1.isPromise)(selector)) {
|
|
240
258
|
getExecuteScriptArgs = function getExecuteScriptArgs() {
|
|
241
|
-
const localRest = rest.map((item) => item && item.getWebDriverElement ? item.getWebDriverElement() : item);
|
|
259
|
+
const localRest = rest.map((item) => (item && item.getWebDriverElement ? item.getWebDriverElement() : item));
|
|
242
260
|
const rootPromiseIfRequired = root && root.getWebDriverElement ? root.getWebDriverElement() : root;
|
|
243
261
|
return [rootPromiseIfRequired, ...localRest];
|
|
244
262
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swd_element.js","sourceRoot":"","sources":["../../lib/swd/swd_element.ts"],"names":[],"mappings":";;;AAAA,4BAA4B;AAC5B,
|
|
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.37",
|
|
4
4
|
"description": "Library for automation testing",
|
|
5
5
|
"main": "./built/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -47,9 +47,10 @@
|
|
|
47
47
|
"automation testing"
|
|
48
48
|
],
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@types/selenium-webdriver": "4.0.
|
|
51
|
-
"
|
|
50
|
+
"@types/selenium-webdriver": "4.0.19",
|
|
51
|
+
"prettier": "^2.6.2",
|
|
52
|
+
"sat-utils": "0.0.42",
|
|
52
53
|
"selenium-standalone": "^7.1.0",
|
|
53
54
|
"selenium-webdriver": "4.1.1"
|
|
54
55
|
}
|
|
55
|
-
}
|
|
56
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { By, WebDriver, until, Key } from 'selenium-webdriver';
|
|
2
|
+
import { expect } from 'assertior';
|
|
3
|
+
import { seleniumWD, BaseConf } from '../lib';
|
|
4
|
+
|
|
5
|
+
describe.skip('Base', () => {
|
|
6
|
+
it('example spec', async () => {
|
|
7
|
+
const { getSeleniumDriver, browser } = seleniumWD;
|
|
8
|
+
const config: BaseConf = {
|
|
9
|
+
seleniumSessionId: 'a77dc7a90c1f59bb7aa31622415761d3',
|
|
10
|
+
seleniumAddress: 'http://localhost:4444/wd/hub',
|
|
11
|
+
};
|
|
12
|
+
await getSeleniumDriver(config, browser);
|
|
13
|
+
await browser.get('https://google.com');
|
|
14
|
+
});
|
|
15
|
+
});
|