Merge c771b175b1 into 1eb9aa0eed

packages/node_modules/@node-red/nodes/core/common/24-complete.js

@@ -21,6 +21,15 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         var node = this;
         this.scope = n.scope;
+
+        // auto-filter out any directly connected nodes to avoid simple loopback
+        const w = this.wires.flat().toString();
+        for (let i=0; i < this.scope.length; i++) {
+            if (w.includes(this.scope[i])) {
+                this.scope.splice(i, 1);
+            }
+        }
+
         this.on("input",function(msg, send, done) {
             send(msg);
             done();

packages/node_modules/@node-red/nodes/core/common/25-status.js

@@ -21,6 +21,15 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         var node = this;
         this.scope = n.scope;
+
+        // auto-filter out any directly connected nodes to avoid simple loopback
+        const w = this.wires.flat().toString();
+        for (let i=0; i < this.scope.length; i++) {
+            if (w.includes(this.scope[i])) {
+                this.scope.splice(i, 1);
+            }
+        }
+
         this.on("input", function(msg, send, done) {
             send(msg);
             done();

test/nodes/core/common/24-complete_spec.js

@@ -0,0 +1,54 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+var should = require("should");
+var catchNode = require("nr-test-utils").require("@node-red/nodes/core/common/24-complete.js");
+var helper = require("node-red-node-test-helper");
+
+describe('complete Node', function() {
+
+    afterEach(function() {
+        helper.unload();
+    });
+
+    it('should output a message when called', function(done) {
+        var flow = [ { id:"n1", type:"complete", name:"status", wires:[["n2"]], scope:[] },
+            {id:"n2", type:"helper"} ];
+        helper.load(catchNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            n1.should.have.property('name', 'status');
+            n2.on("input", function(msg) {
+                msg.text.should.equal("Oh dear");
+                msg.should.have.property('source');
+                msg.source.should.have.property('id',"12345");
+                msg.source.should.have.property('type',"testnode");
+                msg.source.should.have.property('name',"fred");
+                done();
+            });
+            var mst = {
+                text: "Oh dear",
+                source: {
+                    id: "12345",
+                    type: "testnode",
+                    name: "fred"
+                }
+            }
+            n1.emit("input", mst);
+        });
+    });
+
+});

test/nodes/core/common/25-status_spec.js

@@ -25,7 +25,7 @@ describe('status Node', function() {
     });
 
     it('should output a message when called', function(done) {
-        var flow = [ { id:"n1", type:"status", name:"status", wires:[["n2"]] },
+        var flow = [ { id:"n1", type:"status", name:"status", wires:[["n2"]], scope:[] },
             {id:"n2", type:"helper"} ];
         helper.load(catchNode, flow, function() {
             var n1 = helper.getNode("n1");