topological-nodered-wdio 0.3.0 → 0.3.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/package.json +1 -1
- package/src/explicit-wait.js +5 -6
- package/src/wdio-common.js +30 -20
package/package.json
CHANGED
package/src/explicit-wait.js
CHANGED
|
@@ -18,26 +18,25 @@ module.exports = function(RED) {
|
|
|
18
18
|
locateValue
|
|
19
19
|
)
|
|
20
20
|
|
|
21
|
-
let time = parseInt(config.time
|
|
21
|
+
let time = parseInt(config.time || msg.time)
|
|
22
22
|
let reverse = config.reverse === 'true' || msg.reverse
|
|
23
23
|
let error = config.error || msg.error
|
|
24
24
|
|
|
25
|
-
let boolReverse = reverse === 'false' ? false : true
|
|
26
|
-
|
|
27
25
|
if (config.action === 'displayed') {
|
|
28
26
|
node.log = `Waiting for the element to be displayed for ${time}, identified using ${locateUsing}: "${locateValue}".`
|
|
29
|
-
await element.waitForDisplayed(time,
|
|
27
|
+
await element.waitForDisplayed({timeout: time, reverse: reverse, timeoutMsg: error, interval : 2000})
|
|
30
28
|
} else if (config.action === 'enabled') {
|
|
31
29
|
node.log = `Waiting for the element to be enabled for ${time}, identified using ${locateUsing}: "${locateValue}".`
|
|
32
|
-
await element.waitForEnabled(time,
|
|
30
|
+
await element.waitForEnabled({timeout: time, reverse: reverse, timeoutMsg: error, interval : 2000})
|
|
33
31
|
} else if (config.action === 'exists') {
|
|
34
32
|
node.log = `Waiting for the element to be exists for ${time}, identified using ${locateUsing}: "${locateValue}".`
|
|
35
|
-
await element.waitForExist(time,
|
|
33
|
+
await element.waitForExist({timeout: time, reverse: reverse, timeoutMsg: error, interval : 2000})
|
|
36
34
|
} else if (config.action === 'until') {
|
|
37
35
|
await element.waitUntil()
|
|
38
36
|
}
|
|
39
37
|
|
|
40
38
|
if (error) {
|
|
39
|
+
await common.log(node)
|
|
41
40
|
common.handleError(error, node, msg)
|
|
42
41
|
} else {
|
|
43
42
|
await common.log(node)
|
package/src/wdio-common.js
CHANGED
|
@@ -71,27 +71,37 @@ module.exports.getElementId = async (browser, using, value) => {
|
|
|
71
71
|
}
|
|
72
72
|
|
|
73
73
|
module.exports.getElement = async (browser, using, value) => {
|
|
74
|
-
let
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
74
|
+
let locator = ''
|
|
75
|
+
switch (using) {
|
|
76
|
+
case 'id':
|
|
77
|
+
locator = `#${value}`
|
|
78
|
+
break
|
|
79
|
+
case 'name':
|
|
80
|
+
locator = `[name='${value}']`
|
|
81
|
+
break
|
|
82
|
+
case 'className':
|
|
83
|
+
locator = `.${value}`
|
|
84
|
+
break
|
|
85
|
+
case 'tagName':
|
|
86
|
+
locator = value
|
|
87
|
+
break
|
|
88
|
+
case 'cssSelector':
|
|
89
|
+
locator = value
|
|
90
|
+
break
|
|
91
|
+
case 'text':
|
|
92
|
+
locator = `=${value}`
|
|
93
|
+
break
|
|
94
|
+
case 'partialText':
|
|
95
|
+
locator = `*=${value}`
|
|
96
|
+
break
|
|
97
|
+
case 'xPath':
|
|
98
|
+
locator = value
|
|
99
|
+
break
|
|
100
|
+
default:
|
|
101
|
+
locator = value
|
|
102
|
+
}
|
|
93
103
|
|
|
94
|
-
element = await browser.$(
|
|
104
|
+
element = await browser.$(locator)
|
|
95
105
|
return element
|
|
96
106
|
}
|
|
97
107
|
|