1
0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00

Merge pull request #724 from vielmetti/travis-node-4

Support for Node 4.0.0 and Travis CI testing for same
This commit is contained in:
Nick O'Leary 2015-09-25 23:02:49 +01:00
commit caa83ac830
3 changed files with 17 additions and 2 deletions

View File

@ -1,8 +1,23 @@
sudo: false sudo: false
language: node_js language: node_js
env:
- CXX="g++-4.8"
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- gcc-4.8
matrix:
allow_failures:
- node_js: "4.1.0"
before_install: before_install:
- npm install -g npm@~1.4.18 - npm install -g npm@~1.4.18
# node_js 4.1.0 is brand new
node_js: node_js:
- "4.1.0"
- "4.0.0"
- "0.12" - "0.12"
- "0.10" - "0.10"
script: script:

View File

@ -64,7 +64,7 @@ module.exports = function(RED) {
else if (node.op1Templated) { msg.payload = mustache.render(node.op1,msg); } else if (node.op1Templated) { msg.payload = mustache.render(node.op1,msg); }
else { msg.payload = node.op1; } else { msg.payload = node.op1; }
if (node.op1type !== "nul") { node.send(msg); } if (node.op1type !== "nul") { node.send(msg); }
if (node.duration === 0) { tout = "infinite"; } if (node.duration === 0) { tout = 0; }
else { else {
tout = setTimeout(function() { tout = setTimeout(function() {
msg.payload = m2; msg.payload = m2;

View File

@ -457,7 +457,7 @@ describe('file Nodes', function() {
logEvents.should.have.length(1); logEvents.should.have.length(1);
logEvents[0][0].should.have.a.property('msg'); logEvents[0][0].should.have.a.property('msg');
//logEvents[0][0].msg.toString().should.equal("Error: ENOENT, open 'badfile'"); //logEvents[0][0].msg.toString().should.equal("Error: ENOENT, open 'badfile'");
logEvents[0][0].msg.toString().should.startWith("Error: ENOENT, open"); logEvents[0][0].msg.toString().should.startWith("Error: ENOENT");
done(); done();
},wait); },wait);
n1.receive({payload:""}); n1.receive({payload:""});