topological-nodered-wdio 0.4.4 → 0.4.6

package/package.json

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

package/src/dropdown-action.html

@@ -33,10 +33,10 @@
     inputs: 1,
     outputs: 1,
     icon: 'white-globe.png',
-    label: function() {
+    label: function () {
       return this.name || 'dropdown action'
     },
-    oneditprepare: function() {
+    oneditprepare: function () {
       setDropdownAction()
     }
   })
@@ -46,10 +46,14 @@
   <div class="form-row">
       <label for="node-input-locateUsing"><i class="fa fa-tasks"></i> Locate Method</label>
       <select type="text" id="node-input-locateUsing" style="width:70%;">
-          <option value="id">id</option>
-          <option value="name">name</option>
-          <option value="className">Class Name</option>
-          <option value="selector">Jquery Selector</option>
+        <option value="id">id</option>
+        <option value="name">name</option>
+        <option value="className">Class Name</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">
@@ -118,4 +122,4 @@
             <li>Get Value</li>
         </ul>
    </p>
-</script>
+</script>

package/src/dropdown-action.js

@@ -12,11 +12,12 @@ module.exports = function(RED) {
         let locateValue = config.locateValue || msg.locateValue
 
         let browser = await common.getBrowser(node.context())
-        let element = await common.getElement(
+        let locator = await common.getLocator(
           browser,
           locateUsing,
           locateValue
         )
+        let element = await browser.$(locator)
 
         let text = config.text || msg.text
         let attribute = config.attribute || msg.attribute

package/src/new-session.html

@@ -53,6 +53,7 @@
       <select type="text" id="node-input-webdriverBrowser" style="width:70%;">
           <option value="chrome" selected>Chrome</option>
           <option value="chromium">Chromium</option>
+          <option value="custom">Custom</option>
       </select>
   </div>
   <div class="form-row">
@@ -86,8 +87,7 @@
           <dd>The string format should be <protocal>://<hotsname>:<port number>/<path>, user 80/8080/443 if it is service based webdriver provider.</dd>
           <dd><code>msg.webdriverUri</code> can be used by leaving the webdriverUri field blank.</dd>
           <dt>Browser: <span class="property-type">string</span></dt>
-          <dd>Current configurations are only for chrome.</dd>
-          <dd><code>msg.webdriverBrowser</code> can be used by leaving the webdriverBrowser blank.</dd>
+          <dd>Chrome configs are default. We can pass custom capabilities by selecting Browser as `Custom` and pass `msg.capabilities` to the node.</dd>
           <dt>logLevel: <span class="property-type">string</span></dt>
           <dd>Select the log level to display the logs on console during run.</dd>
           <dt>killSession: <span class="property-type">Bool</span></dt>

package/src/new-session.js

@@ -12,11 +12,11 @@ module.exports = function(RED) {
         const webdriverConfig = Object.assign(
           { logLevel: config.logLevel },
           parseUri(config.webdriverUri || msg.webdriverUri, node),
-          getCapabilities(
+          config.browser != "custom"? getCapabilities(
             config.webdriverProvider,
-            config.webdriverBrowser || msg.webdriverBrowser,
+            config.webdriverBrowser,
             config.browserlessToken
-          )
+          ) : msg.capabilities
         )
         node.log = `Open new browser.`
         let b = await common.newSession(webdriverConfig, node, node.context())