Merge remote-tracking branch 'upstream/dev' into dev

test/nodes/core/common/91-global-config_spec.js

@@ -44,4 +44,30 @@ describe('unknown Node', function() {
         });
     });
 
+    it('should evaluate a global environment variable that is a JSONata value', function (done) {
+        const flow = [{
+            id: "n1", type: "global-config", name: "XYZ",
+            env: [
+                { name: "now-var", type: "jsonata", value: "$millis()" }
+            ]
+        },
+        { id: "n2", type: "inject", topic: "t1", payload: "now-var", payloadType: "env", wires: [["n3"]], z: "flow" },
+        { id: "n3", type: "helper" }
+        ];
+        helper.load([config, inject], flow, function () {
+            var n2 = helper.getNode("n2");
+            var n3 = helper.getNode("n3");
+            n3.on("input", (msg) => {
+                try {
+                    const now = Date.now();
+                    msg.should.have.property("payload").and.be.approximately(now, 1000);
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            });
+            n2.receive({});
+        });
+    });
+
 });

test/nodes/core/function/10-function_spec.js

@@ -1424,7 +1424,30 @@ describe('function node', function() {
         });
     });
 
-
+    it('should timeout if timeout is set', function(done) {
+        var flow = [{id:"n1",type:"function",wires:[["n2"]],timeout:"0.010",func:"while(1==1){};\nreturn msg;"}];
+        helper.load(functionNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            n1.receive({payload:"foo",topic: "bar"});
+            setTimeout(function() {
+                try {
+                    helper.log().called.should.be.true();
+                    var logEvents = helper.log().args.filter(function(evt) {
+                        return evt[0].type == "function";
+                    });
+                    logEvents.should.have.length(1);
+                    var msg = logEvents[0][0];
+                    msg.should.have.property('level', helper.log().ERROR);
+                    msg.should.have.property('id', 'n1');
+                    msg.should.have.property('type', 'function');
+                    should.equal(msg.msg.message, 'Script execution timed out after 10ms');
+                    done();
+                } catch(err) {
+                    done(err);
+                }
+            },50);
+        });
+    });
 
     describe("finalize function", function() {