topological-nodered-wdio 0.2.8 → 0.3.1

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.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/explicit-wait.js +5 -5
  3. package/src/wdio-common.js +30 -25
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "topological-nodered-wdio",
3
3
  "description": "Open source WebdriverIO nodes for Node-RED",
4
- "version": "0.2.8",
4
+ "version": "0.3.1",
5
5
  "author": "topological",
6
6
  "license": "MIT",
7
7
  "repository": {
package/src/explicit-wait.js CHANGED
@@ -18,21 +18,21 @@ module.exports = function(RED) {
18
18
  locateValue
19
19
  )
20
20
 
21
- let time = parseInt(config.time) || msg.time
22
- let reverse = config.reverse || msg.reverse
21
+ let time = parseInt(config.time || msg.time)
22
+ let reverse = config.reverse === 'true' || msg.reverse
23
23
  let error = config.error || msg.error
24
24
 
25
25
  let boolReverse = reverse === 'false' ? false : true
26
26
 
27
27
  if (config.action === 'displayed') {
28
28
  node.log = `Waiting for the element to be displayed for ${time}, identified using ${locateUsing}: "${locateValue}".`
29
- await element.waitForDisplayed(time, boolReverse, error)
29
+ await element.waitForDisplayed(time, boolReverse, error, 2000)
30
30
  } else if (config.action === 'enabled') {
31
31
  node.log = `Waiting for the element to be enabled for ${time}, identified using ${locateUsing}: "${locateValue}".`
32
- await element.waitForEnabled(time, boolReverse, error)
32
+ await element.waitForEnabled(time, boolReverse, error, 2000)
33
33
  } else if (config.action === 'exists') {
34
34
  node.log = `Waiting for the element to be exists for ${time}, identified using ${locateUsing}: "${locateValue}".`
35
- await element.waitForExist(time, boolReverse, error)
35
+ await element.waitForExist(time, boolReverse, error, 2000)
36
36
  } else if (config.action === 'until') {
37
37
  await element.waitUntil()
38
38
  }
package/src/wdio-common.js CHANGED
@@ -71,32 +71,37 @@ module.exports.getElementId = async (browser, using, value) => {
71
71
  }
72
72
 
73
73
  module.exports.getElement = async (browser, using, value) => {
74
- let selector = ''
75
- let element
76
- switch (using) {
77
- case 'id':
78
- selector = '#' + value
79
- break
80
- case 'name':
81
- selector = value
82
- break
83
- case 'className':
84
- selector = '.' + value
85
- break
86
- case 'selector':
87
- selector = value
88
- break
89
- default:
90
- selector = value
91
- break
92
- }
93
-
94
- try {
95
- element = await browser.$(selector)
96
- } catch (e) {
97
- throw e
98
- }
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
+ }
99
103
 
104
+ element = await browser.$(locator)
100
105
  return element
101
106
  }
102
107