frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Fix circular reference in join node (#1412)

Browse Source 
and add a test case
This commit is contained in:
Hiroki Uchikawa 2017-09-29 03:09:54 +09:00 committed by Dave Conway-Jones
parent 81256279a8
commit cb4f46decc
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nodes/core/logic/17-split.js
View File

@ -300,6 +300,9 @@ module.exports = function(RED) {
} }
RED.util.setMessageProperty(group.msg,node.property,group.payload.join(groupJoinChar)); RED.util.setMessageProperty(group.msg,node.property,group.payload.join(groupJoinChar));
} else { } else {
if (node.propertyType === 'full') {
group.msg = RED.util.cloneMessage(group.msg);
}
RED.util.setMessageProperty(group.msg,node.property,group.payload); RED.util.setMessageProperty(group.msg,node.property,group.payload);
} }
if (group.msg.hasOwnProperty('parts') && group.msg.parts.hasOwnProperty('parts')) { if (group.msg.hasOwnProperty('parts') && group.msg.parts.hasOwnProperty('parts')) {

25
test/nodes/core/logic/17-split_spec.js
View File

@ -559,6 +559,31 @@ describe('JOIN node', function() {
}); });
}); });
it('should join complete message objects into an array after a count', function(done) {
var flow = [{id:"n1", type:"join", wires:[["n2"]], build:"array", timeout:0, count:3, propertyType:"full",mode:"custom"},
{id:"n2", type:"helper"}];
helper.load(joinNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
try {
msg.payload.should.be.an.Array();
msg.payload[0].should.be.an.Object();
msg.payload[0].should.have.property("payload","a");
msg.payload[1].should.be.an.Object();
msg.payload[1].should.have.property("payload","b");
msg.payload[2].should.be.an.Object();
msg.payload[2].should.have.property("payload","c");
done();
}
catch(e) { done(e); }
});
n1.receive({payload:"a"});
n1.receive({payload:"b"});
n1.receive({payload:"c"});
});
});
it('should join split things back into an array', function(done) { it('should join split things back into an array', function(done) {
var flow = [{id:"n1", type:"join", wires:[["n2"]]}, var flow = [{id:"n1", type:"join", wires:[["n2"]]},
{id:"n2", type:"helper"}]; {id:"n2", type:"helper"}];