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

let HTML node return empty array for no matching input.

Browse Source 
to Close #1582
This commit is contained in:
Dave Conway-Jones 2018-01-26 14:26:49 +00:00
parent d355de509b
commit 8179813fe1
No known key found for this signature in database
GPG Key ID: 9E7F9C73F5168CD4
2 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nodes/core/parsers/70-HTML.js
View File

@ -31,11 +31,11 @@ module.exports = function(RED) {
try { try {
var $ = cheerio.load(msg.payload); var $ = cheerio.load(msg.payload);
var pay = []; var pay = [];
var count = 0; var count = 0;
$(tag).each(function() { $(tag).each(function() {
count++; count++;
}); });
var index = 0; var index = 0;
$(tag).each(function() { $(tag).each(function() {
if (node.as === "multi") { if (node.as === "multi") {
var pay2 = null; var pay2 = null;
@ -46,13 +46,13 @@ module.exports = function(RED) {
/* istanbul ignore else */ /* istanbul ignore else */
if (pay2) { if (pay2) {
msg.payload = pay2; msg.payload = pay2;
msg.parts = { msg.parts = {
id: msg._msgid, id: msg._msgid,
index: index, index: index,
count: count, count: count,
type: "string", type: "string",
ch: "" ch: ""
}; };
node.send(msg); node.send(msg);
} }
} }
@ -62,13 +62,14 @@ module.exports = function(RED) {
if (node.ret === "attr") { pay.push( this.attribs ); } if (node.ret === "attr") { pay.push( this.attribs ); }
//if (node.ret === "val") { pay.push( $(this).val() ); } //if (node.ret === "val") { pay.push( $(this).val() ); }
} }
index++; index++;
}); });
if ((node.as === "single") && (pay.length !== 0)) { if (node.as === "single") { // Always return an array - even if blank
msg.payload = pay; msg.payload = pay;
node.send(msg); node.send(msg);
} }
} catch (error) { }
catch (error) {
node.error(error.message,msg); node.error(error.message,msg);
} }
} }

21
test/nodes/core/parsers/70-HTML_spec.js
View File

@ -66,6 +66,25 @@ describe('html node', function() {
}); });
}); });
it('should emit an empty array if no matching elements', function(done) {
fs.readFile(file, 'utf8', function(err, data) {
var flow = [{id:"n1",type:"html",wires:[["n2"]],func:"return msg;"},
{id:"n2", type:"helper"}];
helper.load(htmlNode, flow, function() {
var n1 = helper.getNode("n1");
var n2 = helper.getNode("n2");
n2.on("input", function(msg) {
msg.should.have.property('topic', 'bar');
msg.should.have.property('payload');
msg.payload.should.be.empty;
done();
});
n1.receive({payload:data,topic:"bar",select:"h4"});
});
});
});
it('should retrieve paragraph contents when specified', function(done) { it('should retrieve paragraph contents when specified', function(done) {
fs.readFile(file, 'utf8', function(err, data) { fs.readFile(file, 'utf8', function(err, data) {
var flow = [{id:"n1",type:"html",wires:[["n2"]],ret:"text",tag:"p"}, var flow = [{id:"n1",type:"html",wires:[["n2"]],ret:"text",tag:"p"},
@ -141,7 +160,7 @@ describe('html node', function() {
}); });
}); });
it('should retrive an attribute from a tag', function(done) { it('should retrieve an attribute from a tag', function(done) {
fs.readFile(file, 'utf8', function(err, data) { fs.readFile(file, 'utf8', function(err, data) {
var flow = [{id:"n1",type:"html",wires:[["n2"]],ret:"attr",tag:"span img"}, var flow = [{id:"n1",type:"html",wires:[["n2"]],ret:"attr",tag:"span img"},
{id:"n2", type:"helper"}]; {id:"n2", type:"helper"}];