topological-nodered-wdio 1.1.0 → 1.1.1

package/package.json

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

package/src/dropdown-action.js

@@ -13,7 +13,6 @@ module.exports = function(RED) {
 
         let browser = await common.getBrowser(node.context())
         let locator = await common.getLocator(
-          browser,
           locateUsing,
           locateValue
         )

package/src/element-action.html

@@ -144,7 +144,7 @@
       <input id="node-input-locateType" type="checkbox" style="width:30px;" onchange="showSelectors()">
   </div>
   <div class="form-row">
-      <label for="node-input-locateUsing"><i class="fa fa-tasks"></i> Locate Method</label>
+      <label for="node-input-locateUsing"><i class="fa fa-tasks"></i> Locate Using</label>
       <select type="text" id="node-input-locateUsing" style="width:70%;">
           <option value="id">id</option>
           <option value="name">name</option>
@@ -160,7 +160,7 @@
       <input id="node-input-locateValue" type="text">
   </div>
   <div class="form-row node-input-locateValues-container-row" style="position:relative">
-        <h4 style="margin-bottom: -3px;">Selectors :</h4>
+        <h4 style="margin-bottom: 3px;">Selectors :</h4>
         <ol id="node-input-locateValues-container"></ol>
   </div>   
 </script>

package/src/element-action.js

@@ -1,107 +1,134 @@
-const common = require('./wdio-common')
+const common = require("./wdio-common");
 
-module.exports = function(RED) {
+module.exports = function (RED) {
   function elementAction(config) {
-    RED.nodes.createNode(this, config)
-    const node = this
-    const context = node.context()
-    common.clearStatus(node)
+    RED.nodes.createNode(this, config);
+    const node = this;
+    const context = node.context();
+    common.clearStatus(node);
 
     var getTypeInputValue = async (msg, type, value) => {
-      var r = ''
+      var r = "";
       switch (type) {
-        case 'msg':
-          r = RED.util.getMessageProperty(msg, value)
-          break
-        case 'flow':
-          r = context.flow.get(value)
-          break
-        case 'global':
-          r = context.global.get(value)
-          break
-        case 'str':
+        case "msg":
+          r = RED.util.getMessageProperty(msg, value);
+          break;
+        case "flow":
+          r = context.flow.get(value);
+          break;
+        case "global":
+          r = context.global.get(value);
+          break;
+        case "str":
           try {
-            r = unescape(JSON.parse('"' + value + '"'))
+            r = unescape(JSON.parse('"' + value + '"'));
           } catch (e) {
-            r = value
+            r = value;
           }
-          break
-        case 'num':
-          r = parseFloat(value)
-          break
-        case 'json':
-          if (value !== '') {
-            r = JSON.parse(value)
+          break;
+        case "num":
+          r = parseFloat(value);
+          break;
+        case "json":
+          if (value !== "") {
+            r = JSON.parse(value);
           } else {
-            r = undefined
+            r = undefined;
           }
       }
-      return r
-    }
+      return r;
+    };
 
-    node.on('input', async (msg) => {
+    node.on("input", async (msg) => {
       try {
-        let multiple = config.locateType || msg.locateType
-        let locateValues = config.locateValues || msg.locateValues
-        let locateUsing = multiple ? locateValues[0].using : config.locateUsing || msg.locateUsing
-        let locateValue = multiple ? locateValues[0].value : config.locateValue || msg.locateValue
-        
-        let browser = await common.getBrowser(context)
-        let capabilities = browser.capabilities
-        let elementId = await common.getElementId(
-          browser,
-          locateUsing,
-          locateValue
-        )
+        let multiple = config.locateType || msg.locateType;
+        let locateValues = config.locateValues || msg.locateValues;
+        let locateUsing = config.locateUsing || msg.locateUsing;
+        let locateValue = config.locateValue || msg.locateValue;
 
-        let attribute = config.attribute || msg.attribute
+        let browser = await common.getBrowser(context);
+        let capabilities = browser.capabilities;
+        let elementId = null;
+        node.log = "";
 
-        if (config.action === 'click') {
-          node.log = `Click on the webelement identified using ${locateUsing}: "${locateValue}".`
-          await browser.elementClick(elementId)
-        } else if (config.action === 'clear') {
-          node.log = `Clear the Value of the webelement identified using ${locateUsing}: "${locateValue}".`
-          await browser.elementClear(elementId)
-        } else if (config.action === 'sendKeys') {
+        if (!multiple) {
+          elementId = await common.getElementId(
+            browser,
+            locateUsing,
+            locateValue
+          );
+          if (!elementId) {
+            throw new Error(`Element not found using ${locateUsing}: ${locateValue}`);
+          }
+        } else {
+          for (let i = 0; i < locateValues.length; i++) {
+            const { using, value } = locateValues[i];
+            elementId = await common.getElementId(browser, using, value);
+            if (elementId) {
+              node.log += `Attempt ${i + 1}: Element found using ${using}: ${value}\n`;
+              locateUsing = using
+              locateValue = value
+              break;
+            }
+            else {
+              node.log += `Attempt ${i + 1}: Element not found using ${using}: ${value}\n`;
+              node.warn(`Element not found using ${using}: ${value}`);
+            }
+          }
+          if (!elementId) {
+            throw new Error(`Element not found using all selector values`);
+          }
+        }
+
+        let attribute = config.attribute || msg.attribute;
+
+        if (config.action === "click") {
+          node.log += `Click on the webelement identified using ${locateUsing}: "${locateValue}".`;
+          await browser.elementClick(elementId);
+        } else if (config.action === "clear") {
+          node.log += `Clear the Value of the webelement identified using ${locateUsing}: "${locateValue}".`;
+          await browser.elementClear(elementId);
+        } else if (config.action === "sendKeys") {
           let value = await getTypeInputValue(
             msg,
             config.object,
             config.sendKeys
-          )
-          node.log = `Enter the Value: "${value}" to the webelement identified using ${locateUsing}: "${locateValue}".`
+          );
+          node.log += `Enter the Value: "${value}" to the webelement identified using ${locateUsing}: "${locateValue}".`;
           await browser.elementSendKeys(
             elementId,
             capabilities.version ? Array.from(value) : value
-          )
-        } else if (config.action === 'getValue') {
-          node.log = `Get the Value of webelement identified using ${locateUsing}: "${locateValue}".`
-          msg.payload = await browser.getElementAttribute(elementId, 'value')
-        } else if (config.action === 'getText') {
-          node.log = `Get the Text of webelement identified using ${locateUsing}: "${locateValue}".`
-          msg.payload = await browser.getElementText(elementId)
-        } else if (config.action === 'getAttribute') {
-          node.log = `Get the Attribute: "${attribute}" of webelement identified using ${locateUsing}: "${locateValue}".`
-          msg.payload = await browser.getElementAttribute(elementId, attribute)
-        } else if (config.action === 'takeScreenShot') {
-          node.log = 'Take the screenshot of the webelement.'
-          msg.payload = await browser.takeElementScreenshot(elementId)
-        } else if (config.action === 'hover') {
+          );
+        } else if (config.action === "getValue") {
+          node.log += `Get the Value of webelement identified using ${locateUsing}: "${locateValue}".`;
+          msg.payload = await browser.getElementAttribute(elementId, "value");
+        } else if (config.action === "getText") {
+          node.log += `Get the Text of webelement identified using ${locateUsing}: "${locateValue}".`;
+          msg.payload = await browser.getElementText(elementId);
+        } else if (config.action === "getAttribute") {
+          node.log += `Get the Attribute: "${attribute}" of webelement identified using ${locateUsing}: "${locateValue}".`;
+          msg.payload = await browser.getElementAttribute(elementId, attribute);
+        } else if (config.action === "takeScreenShot") {
+          node.log += "Take the screenshot of the webelement.";
+          msg.payload = await browser.takeElementScreenshot(elementId);
+        } else if (config.action === "hover") {
           let element = await common.getElement(
             browser,
             locateUsing,
             locateValue
-          )
-          node.log = `Hover on the webelement identified using ${locateUsing}: "${locateValue}".`
-          msg.payload = await element.moveTo()
+          );
+          node.log += `Hover on the webelement identified using ${locateUsing}: "${locateValue}".`;
+          msg.payload = await element.moveTo();
         }
-        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)
+        node.log = `Error: ${e.message}`;
+        await common.log(node);
+        common.handleError(e, node, msg);
       }
-    })
+    });
   }
-  RED.nodes.registerType('element-action', elementAction)
-}
+  RED.nodes.registerType("element-action", elementAction);
+};

package/src/wdio-common.js

@@ -1,13 +1,13 @@
-const wdio = require('webdriverio')
-let newSessionNode
+const wdio = require("webdriverio");
+let newSessionNode;
 
 module.exports.getBrowser = (context) => {
-  let browser = context.flow.get('wdio_browser')
+  let browser = context.flow.get("wdio_browser");
   if (!browser || !browser.sessionId)
-    throw new Error('No session defined - call newSession first')
+    throw new Error("No session defined - call newSession first");
 
-  return browser
-}
+  return browser;
+};
 
 /*
 config = {
@@ -25,139 +25,131 @@ config = {
 }
 */
 module.exports.newSession = async (config, node, context) => {
-  let browser
+  let browser;
   try {
-    browser = await wdio.remote(config)
-    context.flow.set('wdio_browser', browser)
-    newSessionNode = node
+    browser = await wdio.remote(config);
+    context.flow.set("wdio_browser", browser);
+    newSessionNode = node;
   } catch (e) {
-    throw e
+    throw e;
   }
-  return browser
-}
+  return browser;
+};
 
 module.exports.deleteSession = async (context) => {
-  let b
-  let browser = context.flow.get('wdio_browser')
+  let b;
+  let browser = context.flow.get("wdio_browser");
   try {
-    b = { sessionId: browser.sessionId }
-    await browser.closeWindow()
-    await browser.deleteSession()
-    context.flow.set('wdio_browser', null)
-    if (newSessionNode) module.exports.disconnected(newSessionNode)
+    b = { sessionId: browser.sessionId };
+    await browser.closeWindow();
+    await browser.deleteSession();
+    context.flow.set("wdio_browser", null);
+    if (newSessionNode) module.exports.disconnected(newSessionNode);
   } catch (e) {}
-  return b
-}
+  return b;
+};
 
 module.exports.getElementId = async (browser, using, value) => {
-  let elementId
-  try {
-    const element = await browser.findElement(using, value)
-    if (element && Object.keys(element)) {
-      elementId = element[Object.keys(element)[0]]
-    } else {
-      let e
-      if (element && element.message) {
-        e = element.message
-      } else {
-        e = 'Element not found'
-      }
-      throw new Error(e)
-    }
-  } catch (e) {
-    throw e
+  const element = await browser.findElement(using, value);
+  return element.ELEMENT ?? "";
+};
+
+module.exports.getLocator = async (using, value) => {
+  let locator = "";
+  switch (using) {
+    case "id":
+      locator = `#${value}`;
+      break;
+    case "name":
+      locator = `[name='${value}']`;
+      break;
+    case "className":
+      locator = `.${value}`;
+      break;
+    case "tagName":
+      locator = value;
+      break;
+    case "cssSelector":
+      locator = value;
+      break;
+    case "text":
+      locator = `=${value}`;
+      break;
+    case "partialText":
+      locator = `*=${value}`;
+      break;
+    case "xPath":
+      locator = value;
+      break;
+    default:
+      locator = value;
   }
-  return elementId
-}
 
-module.exports.getLocator = async (browser, using, value) => {
-  let locator = ''
-    switch (using) {
-        case 'id':
-            locator = `#${value}`
-            break
-        case 'name':
-            locator = `[name='${value}']`
-            break
-        case 'className':
-            locator = `.${value}`
-            break
-        case 'tagName':
-            locator = value
-            break
-        case 'cssSelector':
-            locator = value
-            break
-        case 'text':
-            locator = `=${value}`
-            break
-        case 'partialText':
-            locator = `*=${value}`
-            break
-        case 'xPath':
-            locator = value
-            break
-        default:
-            locator = value
-    }
-
-  return locator
-}
+  return locator;
+};
 
 module.exports.handleError = (e, node, msg) => {
-  console.log(e)
-  module.exports.errorStatus(node)
-  node.error(e, msg)
-}
+  console.log(e);
+  module.exports.errorStatus(node);
+  node.error(e, msg);
+};
 
 module.exports.clearStatus = (node) => {
-  node.status({})
-}
+  node.status({});
+};
 
 module.exports.connectedStatus = (node) => {
   node.status({
-    fill: 'green',
-    shape: 'dot',
-    text: 'connected'
-  })
-}
+    fill: "green",
+    shape: "dot",
+    text: "connected",
+  });
+};
 
 module.exports.disconnectedStatus = (node) => {
   node.status({
-    fill: 'green',
-    shape: 'ring',
-    text: 'disconnected'
-  })
-}
+    fill: "green",
+    shape: "ring",
+    text: "disconnected",
+  });
+};
 
 module.exports.successStatus = (node) => {
   node.status({
-    fill: 'green',
-    shape: 'ring',
-    text: 'done'
-  })
-}
+    fill: "green",
+    shape: "ring",
+    text: "done",
+  });
+};
 
 module.exports.errorStatus = (node) => {
   node.status({
-    fill: 'red',
-    shape: 'ring',
-    text: 'error'
-  })
-}
+    fill: "red",
+    shape: "ring",
+    text: "error",
+  });
+};
 
 module.exports.log = async (node) => {
-  let context = node.context()
-  let stepCount = await (context.global.get('stepCount') || 0) + 1
-  let document = await context.global.get('document') || ''
-  await context.global.set('document', `${document}${stepCount}. Node: ${node.name} - ${node.log}\n`)
-  await context.global.set('stepCount', stepCount)
-}
+  let context = node.context();
+  let stepCount = (await (context.global.get("stepCount") || 0)) + 1;
+  let document = (await context.global.get("document")) || "";
+  await context.global.set(
+    "document",
+    `${document}${stepCount}. Node (${node.id}): ${node.name} - ${node.log}\n`
+  );
+  await context.global.set("stepCount", stepCount);
+};
 
 module.exports.document = async (node) => {
-  let context = node.context()
-  let document = await context.global.get('document') || ''
-  document = node.line? `${document}\n${node.name}${node.refUrl? `\nRef: ${node.refUrl}`:''}\n\n` : 
-                          `${document}********************\n${node.name}${node.refUrl? `\nRef: ${node.refUrl}`:''}\n********************\n`
-  await context.global.set('document', document.replaceAll('\\n','\n'))
-}
+  let context = node.context();
+  let document = (await context.global.get("document")) || "";
+  document = node.line
+    ? `${document}\n${node.name}${
+        node.refUrl ? `\nRef: ${node.refUrl}` : ""
+      }\n\n`
+    : `${document}********************\n${node.name}${
+        node.refUrl ? `\nRef: ${node.refUrl}` : ""
+      }\n********************\n`;
+  await context.global.set("document", document.replaceAll("\\n", "\n"));
+};