@gregoriusrippenstein/erlang-red-unittest 0.9.5 → 0.10.3

package/nodes/locales/en-US/ut-assert-values.html

@@ -2,8 +2,14 @@
   <p>Ensure specific values are set on the message passing through this node.</p>
   Ensure specific values are set on the message passing through this node.
 
+<p>
 If the values do not match, this node will cause and error.
 
-**This has no implementation when used with Node-RED, this is a Erlang-RED specific node.**
+<p>
+Upon completion, the node sets the "assert_succeed" flag on the message to either true or false depending on whether
+all tests succeed or some failed. This is an all or one flag.
+
+<p>
+The "assert_failures" array value is set on the message to contain all failures and unsupported features.
 
 </script>

package/nodes/ut-assert-debug.html

@@ -76,6 +76,14 @@
           RED.view.select(item.nodeid);          
         }
       }).on('treelistconfirm', function (event, item) {
+      }).on("treelistitemmouseover", function (e, item) {
+        item.node.highlighted = true;
+        item.node.dirty = true;
+        RED.view.redraw();
+      }).on("treelistitemmouseout", function (e, item) {
+        item.node.highlighted = false;
+        item.node.dirty = true;
+        RED.view.redraw();
       });
 
       var search = $("#node-input-assert-debug-target-filter").searchBox({
@@ -100,6 +108,7 @@
             label: RED.utils.getNodeLabel(nde),
             icon: "",
             nodeid: nde.id,
+            node: nde,
             sublabel: nde.type,
             selected: nde.id == this.nodeid,
             checkbox: false,
@@ -134,7 +143,7 @@
   </div>
 
   <div class="form-row">
-      <input type="checkbox" id="node-input-inverse"
+     <input type="checkbox" id="node-input-inverse"
            style="display:inline-block; width:15px; vertical-align:baseline;">
     <label for="node-input-inverse"><span data-i18n="ut-assert-debug.label.inverse"></span></label>
   </div>
@@ -154,7 +163,7 @@
     </div>
   </div>
 
-    <div class="form-row" style="margin-left: 10px; position: relative; height: 40vh; margin-right: 15px; min-height: 5vh;"">
+    <div class="form-row" style="margin-left: 10px; position: relative; height: 40vh; margin-right: 15px; min-height: 5vh;">
       <div style="margin-bottom: 5px; width: 35%; padding-left: 60%;">
         <input type="text" id="node-input-assert-debug-target-filter">
       </div>

package/nodes/ut-assert-status.html

@@ -91,6 +91,14 @@
           RED.view.select(item.nodeid);
         }        
       }).on('treelistconfirm', function (event, item) {
+      }).on("treelistitemmouseover", function (e, item) {
+        item.node.highlighted = true;
+        item.node.dirty = true;
+        RED.view.redraw();
+      }).on("treelistitemmouseout", function (e, item) {
+        item.node.highlighted = false;
+        item.node.dirty = true;
+        RED.view.redraw();
       });
 
       var search = $("#node-input-assert-status-target-filter").searchBox({
@@ -115,6 +123,7 @@
           label: RED.utils.getNodeLabel(nde),
           icon: "",
           nodeid: nde.id,
+          node: nde,
           sublabel: nde.type,
           selected: nde.id == this.nodeid,
           checkbox: false,

package/nodes/ut-assert-values.html

@@ -42,6 +42,7 @@
     inputs: 1,
 
     outputs: 1,
+    outputLabels: ["result"],
 
     label: function () {
       function prop2name(type, key) {

package/nodes/ut-assert-values.js

@@ -4,6 +4,18 @@ module.exports = function(RED) {
 
     var node = this;
     var cfg = config;
+ 
+    /*
+    * Note to self: getMessageProperty(..) and getObjectProperty(...) only differ in that
+    * getMessageProperty will remove any 'msg.' prefix from the property name. This is not
+    * the case here since we're using the Node-RED inbuilt helpers for setting values.
+    * --> here: https://github.com/node-red/node-red/blob/0f653ed7b2640feba8885e48b9448df7d42acaf0/packages/node_modules/%40node-red/util/lib/util.js#L397-L402
+    *
+    *
+    * from --> https://github.com/node-red/node-red/blob/0f653ed7b2640feba8885e48b9448df7d42acaf0/packages/node_modules/%40node-red/util/lib/util.js#L407-L418
+    *
+    *  getObjectProperty will return undefined if a property isn't set.
+    */
 
 
     var sendToDebug = (nde,rule,msgc,lvl) => {
@@ -24,14 +36,15 @@ module.exports = function(RED) {
      } catch (ex) {
       console.error(ex)
      }
-     return false;
+     return ["failure", rule];
     }
 
     var postUnsupported = (rule, msg) => {
       node.status({ fill: "red", shape: "dot", 
                       text: RED._("ut-assert-values.label.unsupported", { property: JSON.stringify(rule) }) });
       sendToDebug(node, rule, msg, 30)
-      return rule
+      
+      return ["unsupported", rule]
     }
 
     var escapeSpecials = (str) => {
@@ -61,6 +74,12 @@ module.exports = function(RED) {
               if ( parseInt(rule.to) != parseInt(RED.util.getObjectProperty(msg,rule.p)) ) {
                 failures.push(sendToDebug(node, rule, msg, 20))                
               }
+            } else if (rule.tot == "bool") {
+              if ( rule.to == "true" && !RED.util.getObjectProperty(msg, rule.p)) {
+                failures.push(sendToDebug(node, rule, msg, 20))
+              } else if (rule.to == "false" && !!RED.util.getObjectProperty(msg, rule.p) ) {
+                failures.push(sendToDebug(node, rule, msg, 20))
+              }
             } else if (rule.tot == "json") {
               let expObj = JSON.parse(rule.to)
               let oldObj = RED.util.getObjectProperty(msg, rule.p)
@@ -74,6 +93,20 @@ module.exports = function(RED) {
             } else {
               unsupported.push(postUnsupported(rule,msg))
             }
+          /*
+           * Rule is not set on message object
+           */
+          } else if (rule.t == "notset" && rule.pt == "msg") {     
+            if (RED.util.getObjectProperty(msg, rule.p) !== undefined) {
+              failures.push(sendToDebug(node, rule, msg, 20))
+            }
+          /*
+           * Rule is not set on message object
+           */
+          } else if (rule.t == "set" && rule.pt == "msg") {
+            if (RED.util.getObjectProperty(msg, rule.p) === undefined) {
+              failures.push(sendToDebug(node, rule, msg, 20))
+            }
           /*
            * Rule is match
            */
@@ -92,38 +125,28 @@ module.exports = function(RED) {
           } else {
              unsupported.push(postUnsupported(rule,msg))
           }
-        
-          console.log(rule)
         })
 
         if (failures.length > 0 ) {
           node.status({fill: "red", shape: "dot", text: "assert failed"})
+          msg.assert_succeed = false
+          msg.assert_failures = failures.concat(unsupported)
         } else {
           if ( unsupported.length > 0) {
             node.status({ fill: "yellow", shape: "ring", text: "unsupported errors - check debug" })
+            msg.assert_succeed = false
+            msg.assert_failures = failures.concat( unsupported )
           } else {
             node.status({ fill: "green", shape: "ring", text: "assert succeed" })
+            msg.assert_succeed = true
+            delete msg.assert_failures
           }
         }
-        
-        try {
-          try {
-            send(msg);
-            done();
-          } catch ( err ) {
-            // use node.error if the node might send subsequent messages
-            node.error("error occurred", { ...msg, error: err })
-            done();
-          }
-        } catch (err) {
-          // use done if the node won't send anymore messages for the
-          // message it received.
-          msg.error = err
-          done(err.message, msg)
-        }
+
+        send(msg);
+        done();
     });
   }
 
   RED.nodes.registerType("ut-assert-values", CoreutassertvaluesFunctionality);
-
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gregoriusrippenstein/erlang-red-unittest",
-  "version": "0.9.5",
+  "version": "0.10.3",
   "dependencies": {
   },
 
@@ -14,6 +14,7 @@
   ],
 
   "license": "Don't do evil.",
+  "homepage": "https://github.com/gorenje/erlang-red-unittesting-nodes#readme",
   "author": "Gerrit Riessen <gerrit@flowhub.org>",
   "engines": {
     "node": ">=14"
@@ -33,5 +34,13 @@
       "ut-assert-status": "nodes/ut-assert-status.js",
       "ut-assert-debug": "nodes/ut-assert-debug.js"
     }
-  }
+  },
+  
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/gorenje/erlang-red-unittesting-nodes.git"
+  },
+  "bugs": {
+    "url": "https://github.com/gorenje/erlang-red-unittesting-nodes"
+  }  
 }

package/plugins/sidebar.html

@@ -335,7 +335,7 @@ RED.sidebar.addTab({
   visible: true
 });
 
-
+/*
 var tabs = RED.tabs.create({
   id: 'func-unittesting-tabs',
   onchange: function (tab) {
@@ -366,6 +366,9 @@ tabs.addTab({
 });
 
 tabs.activateTab("func-unittesting-tab-pull");
+*/
+
+$('#func-unittesting-tab-pull').show();
 
 var dirList = $("#node-input-unittestingpull-sb-target-container-div").css({
   width: "100%",
@@ -376,7 +379,7 @@ var dirList = $("#node-input-unittestingpull-sb-target-container-div").css({
   }
 ).on('treelistselect', function (event, item) {
     if ( item.flowid) {
-      $('#unittesting-view-testflow-link').prop('href', `?tstid=${item.flowid}`)
+      $('#unittesting-view-testflow-link').prop('href', `https://flows.red-erik.org/f/${item.flowid}`)
       $('#unittesting-view-testflow-link').fadeIn(300)
     } else {
       $('#unittesting-view-testflow-link').fadeOut(300)