topological-nodered-wdio 0.3.2 → 0.4.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "topological-nodered-wdio",
   "description": "Open source WebdriverIO nodes for Node-RED",
-  "version": "0.3.2",
+  "version": "0.4.1",
   "author": "topological",
   "license": "MIT",
   "repository": {

package/src/alert-action.js

@@ -43,6 +43,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/browser-action.js

@@ -61,6 +61,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/delete-session.js

@@ -20,6 +20,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/dropdown-action.js

@@ -40,6 +40,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/element-action.js

@@ -96,6 +96,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/element-check.html

@@ -38,9 +38,13 @@
   <div class="form-row">
       <label for="node-input-check"><i class="fa fa-tasks"></i> Check</label>
       <select type="text" id="node-input-check" style="width:70%;">
-          <option value="selected">Is Element Selected</option>
-          <option value="enabled">Is Element Enabled</option>
-          <option value="displayed">Is Element Displayed</option>
+          <option value="clickable">Is Clickable</option>
+          <option value="displayed">Is Displayed</option>
+          <option value="displayedInView">Is Displayed in Viewport</option>
+          <option value="enabled">Is Enabled</option>
+          <option value="existing">Is Existing</option>
+          <option value="focused">Is Focused</option>
+          <option value="selected">Is Selected</option>
       </select>
   </div>
   <div class="form-row">

package/src/element-check.js

@@ -13,31 +13,39 @@ module.exports = function (RED) {
 
         let browser = await common.getBrowser(node.context())
 
-        let elementId = await common.getElementId(
+        let element = await common.getElement(
           browser,
           locateUsing,
           locateValue
         )
 
-        if (config.check === 'selected') {
-          node.log = `Check the webelement is selected, identified using ${locateUsing}: "${locateValue}".`
-          msg.payload = await browser.isElementSelected(elementId)
-        } else if (config.check === 'enabled') {
-          node.log = `Check the webelement is enabled, identified using ${locateUsing}: "${locateValue}".`
-          msg.payload = await browser.isElementEnabled(elementId)
+        if (config.check === 'clickable') {
+          node.log = `Check the webelement is clickable, identified using ${locateUsing}: "${locateValue}".`
+          msg.payload = await element.isClickable()
         } else if (config.check === 'displayed') {
-          let element = await common.getElement(
-            browser,
-            locateUsing,
-            locateValue
-          )
           node.log = `Check the webelement is displayed, identified using ${locateUsing}: "${locateValue}".`
-          msg.payload = await browser.isElementDisplayed(element.elementId)
+          msg.payload =  await element.isDisplayed()
+        } else if (config.check === 'displayedInView') {
+          node.log = `Check the webelement is displayed in view port, identified using ${locateUsing}: "${locateValue}".`
+          msg.payload = await browser.isDisplayedInViewport()
+        } else if (config.check === 'enabled') {
+          node.log = `Check the webelement is enabled, identified using ${locateUsing}: "${locateValue}".`
+          msg.payload =  await element.isEnabled()
+        } else if (config.check === 'existing') {
+          node.log = `Check the webelement is existing, identified using ${locateUsing}: "${locateValue}".`
+          msg.payload = await browser.isExisting()
+        } else if (config.check === 'focused') {
+          node.log = `Check the webelement is focused, identified using ${locateUsing}: "${locateValue}".`
+          msg.payload =  await element.isFocused()
+        } else if (config.check === 'selected') {
+          node.log = `Check the webelement is selected, identified using ${locateUsing}: "${locateValue}".`
+          msg.payload = await browser.isSelected()
         }
         await common.log(node)
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/execute-script.js

@@ -31,6 +31,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/explicit-wait.html

@@ -42,7 +42,11 @@
         <option value="id">id</option>
         <option value="name">name</option>
         <option value="className">Class Name</option>
-        <option value="selector">Jquery Selector</option>
+        <option value="css selector">CSS selector</option>
+        <option value="link text">Link text</option>
+        <option value="partial link text">Partial link text</option>
+        <option value="tag name">Tag name</option>
+        <option value="xpath" selected>XPath</option>
       </select>
   </div>
   <div class="form-row">
@@ -55,7 +59,7 @@
           <option value="displayed">Wait for Displayed</option>
           <option value="enabled">Wait for Enabled</option>
           <option value="exists">Wait for Exist</option>
-          <option value="until">Wait Until</option>
+          <!-- <option value="until">Wait Until</option>  -->
       </select>
   </div>
   <div class="form-row" id="actionTime" >

package/src/explicit-wait.js

@@ -35,15 +35,11 @@ module.exports = function(RED) {
           await element.waitUntil()
         }
 
-        if (error) {
-          await common.log(node)
-          common.handleError(error, node, msg)
-        } else {
-          await common.log(node)
-          common.successStatus(node)
-          node.send(msg)
-        }
+        await common.log(node)
+        common.successStatus(node)
+        node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/frame-action.js

@@ -29,6 +29,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/implicit-wait-config.js

@@ -32,6 +32,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })

package/src/new-session.js

@@ -25,6 +25,7 @@ module.exports = function(RED) {
         msg.payload = b.sessionId
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })
@@ -39,6 +40,7 @@ module.exports = function(RED) {
           node.log('Disconnected webdriver session ' + sessionId)
         }
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
       done()

package/src/window-action.js

@@ -34,6 +34,7 @@ module.exports = function(RED) {
         common.successStatus(node)
         node.send(msg)
       } catch (e) {
+        await common.log(node)
         common.handleError(e, node, msg)
       }
     })