From c771b175b1accece719e8642d289172dd245172b Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Mon, 21 Apr 2025 14:58:25 +0100 Subject: [PATCH] Add complete test, and fix tests --- .../nodes/core/common/24-complete.js | 2 +- .../@node-red/nodes/core/common/25-status.js | 2 +- test/nodes/core/common/24-complete_spec.js | 54 +++++++++++++++++++ test/nodes/core/common/25-status_spec.js | 2 +- 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 test/nodes/core/common/24-complete_spec.js diff --git a/packages/node_modules/@node-red/nodes/core/common/24-complete.js b/packages/node_modules/@node-red/nodes/core/common/24-complete.js index 4e361fa5b..0eefa6692 100644 --- a/packages/node_modules/@node-red/nodes/core/common/24-complete.js +++ b/packages/node_modules/@node-red/nodes/core/common/24-complete.js @@ -23,7 +23,7 @@ module.exports = function(RED) { this.scope = n.scope; // auto-filter out any directly connected nodes to avoid simple loopback - const w = node.wires.flat().toString(); + 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); diff --git a/packages/node_modules/@node-red/nodes/core/common/25-status.js b/packages/node_modules/@node-red/nodes/core/common/25-status.js index 1fe0f9fe5..14eb3955d 100644 --- a/packages/node_modules/@node-red/nodes/core/common/25-status.js +++ b/packages/node_modules/@node-red/nodes/core/common/25-status.js @@ -23,7 +23,7 @@ module.exports = function(RED) { this.scope = n.scope; // auto-filter out any directly connected nodes to avoid simple loopback - const w = node.wires.flat().toString(); + 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); diff --git a/test/nodes/core/common/24-complete_spec.js b/test/nodes/core/common/24-complete_spec.js new file mode 100644 index 000000000..8927db3bd --- /dev/null +++ b/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); + }); + }); + +}); diff --git a/test/nodes/core/common/25-status_spec.js b/test/nodes/core/common/25-status_spec.js index 41b0a79c8..9457d4372 100644 --- a/test/nodes/core/common/25-status_spec.js +++ b/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");