mirror of
https://github.com/node-red/node-red.git
synced 2025-12-27 07:31:07 +01:00
Merge pull request #5114 from node-red/fix-complete-node-to-filter-simple-feedback
Fix complete node to not feedback immediately connected nodes
This commit is contained in:
@@ -20,7 +20,16 @@ module.exports = function(RED) {
|
||||
function CompleteNode(n) {
|
||||
RED.nodes.createNode(this,n);
|
||||
var node = this;
|
||||
this.scope = n.scope;
|
||||
this.scope = n.scope || [];
|
||||
|
||||
// auto-filter out any directly connected nodes to avoid simple loopback
|
||||
const w = this.wires.flat();
|
||||
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();
|
||||
|
||||
@@ -20,7 +20,16 @@ module.exports = function(RED) {
|
||||
function StatusNode(n) {
|
||||
RED.nodes.createNode(this,n);
|
||||
var node = this;
|
||||
this.scope = n.scope;
|
||||
this.scope = n.scope || [];
|
||||
|
||||
// auto-filter out any directly connected nodes to avoid simple loopback
|
||||
const w = this.wires.flat();
|
||||
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();
|
||||
|
||||
39
test/nodes/core/common/24-complete_spec.js
Normal file
39
test/nodes/core/common/24-complete_spec.js
Normal file
@@ -0,0 +1,39 @@
|
||||
|
||||
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);
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
@@ -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");
|
||||
|
||||
Reference in New Issue
Block a user