From d04ac007323aaa13bfe370bb0f26619b61e23c45 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Fri, 16 Jan 2015 15:43:47 +0000
Subject: [PATCH] Add more Flow_spec tests

---
 red/nodes/Flow.js           |  75 ++---
 test/red/nodes/Flow_spec.js | 529 +++++++++++++++++++++++++++++++++++-
 2 files changed, 556 insertions(+), 48 deletions(-)

diff --git a/red/nodes/Flow.js b/red/nodes/Flow.js
index 857b6fa97..76e603d46 100644
--- a/red/nodes/Flow.js
+++ b/red/nodes/Flow.js
@@ -396,39 +396,44 @@ Flow.prototype.eachNode = function(callback) {
 }
 
 Flow.prototype.applyConfig = function(config,type) {
-    var diff = this.diffFlow(config);
-    //console.log(diff);
-    //var diff = {
-    //    deleted:[]
-    //    changed:[]
-    //    linked:[]
-    //    wiringChanged: []
-    //}
     
-    var nodesToStop = [];
-    var nodesToCreate = [];
-    var nodesToRewire = diff.wiringChanged;
-    
-    if (type == "nodes") {
-        nodesToStop = diff.deleted.concat(diff.changed);
-        nodesToCreate = diff.changed;
-    } else if (type == "flows") {
-        nodesToStop = diff.deleted.concat(diff.changed).concat(diff.linked);
-        nodesToCreate = diff.changed.concat(diff.linked);
-    }
     var activeNodesToStop = [];
+    var nodesToRewire = [];
     
-    for (var i=0;i<nodesToStop.length;i++) {
-        var id = nodesToStop[i];
-        if (this.subflowInstanceNodes[id]) {
-            activeNodesToStop = activeNodesToStop.concat(this.subflowInstanceNodes[id]);
-        } else if (this.activeNodes[id]) {
-            activeNodesToStop.push(id);
+    if (type && type!="full") {
+        var diff = this.diffFlow(config);
+        //console.log(diff);
+        //var diff = {
+        //    deleted:[]
+        //    changed:[]
+        //    linked:[]
+        //    wiringChanged: []
+        //}
+        
+        var nodesToStop = [];
+        var nodesToCreate = [];
+        nodesToRewire = diff.wiringChanged;
+        
+        if (type == "nodes") {
+            nodesToStop = diff.deleted.concat(diff.changed);
+            nodesToCreate = diff.changed;
+        } else if (type == "flows") {
+            nodesToStop = diff.deleted.concat(diff.changed).concat(diff.linked);
+            nodesToCreate = diff.changed.concat(diff.linked);
         }
+        
+        for (var i=0;i<nodesToStop.length;i++) {
+            var id = nodesToStop[i];
+            if (this.subflowInstanceNodes[id]) {
+                activeNodesToStop = activeNodesToStop.concat(this.subflowInstanceNodes[id]);
+            } else if (this.activeNodes[id]) {
+                activeNodesToStop.push(id);
+            }
+        }
+    } else {
+        activeNodesToStop = Object.keys(this.activeNodes);
     }
-    
-    //console.log(activeNodesToStop);
-    
+        
     var flow = this;
     return this.stop(activeNodesToStop).then(function() {
         flow.parseConfig(config);
@@ -556,12 +561,11 @@ Flow.prototype.diffFlow = function(config) {
     });
     
     var markLinkedNodes = function(linkChanged,otherChangedNodes,linkMap,allNodes) {
-        var stack = Object.keys(changedNodes);
+        var stack = Object.keys(changedNodes).concat(Object.keys(otherChangedNodes));
         var visited = {};
         
         while(stack.length > 0) {
             var id = stack.pop();
-                
             var linkedNodes = linkMap[id];
             if (linkedNodes) {
                 for (var i=0;i<linkedNodes.length;i++) {
@@ -576,7 +580,6 @@ Flow.prototype.diffFlow = function(config) {
             }
         }
     }
-    
     markLinkedNodes(linkChangedNodes,{},newLinks,configNodes);
     markLinkedNodes(linkChangedNodes,{},activeLinks,flow.allNodes);
     
@@ -616,7 +619,7 @@ Flow.prototype.diffFlow = function(config) {
             });
         }
     });
-    
+
     markLinkedNodes(linkChangedNodes,modifiedLinkNodes,newLinks,configNodes);
     
     //config.forEach(function(n) {
@@ -629,9 +632,9 @@ Flow.prototype.diffFlow = function(config) {
     //});
     
     var diff = {
-        deleted: Object.keys(deletedNodes),
-        changed: Object.keys(changedNodes),
-        linked: Object.keys(linkChangedNodes),
+        deleted: Object.keys(deletedNodes).filter(function(id) { return deletedNodes[id].type != "subflow" && (!deletedNodes[id].z || configNodes[deletedNodes[id].z].type != "subflow")}),
+        changed: Object.keys(changedNodes).filter(function(id) { return changedNodes[id].type != "subflow" && (!changedNodes[id].z || configNodes[changedNodes[id].z].type != "subflow")}),
+        linked: Object.keys(linkChangedNodes).filter(function(id) { return linkChangedNodes[id].type != "subflow" && (!linkChangedNodes[id].z || configNodes[linkChangedNodes[id].z].type != "subflow")}),
         wiringChanged: []
     }
     
@@ -643,7 +646,7 @@ Flow.prototype.diffFlow = function(config) {
             }
         }
     });
-       
+    
     return diff;
     
 }
diff --git a/test/red/nodes/Flow_spec.js b/test/red/nodes/Flow_spec.js
index 8cb989282..9980a2f09 100644
--- a/test/red/nodes/Flow_spec.js
+++ b/test/red/nodes/Flow_spec.js
@@ -18,7 +18,11 @@
 var should = require("should");
 var sinon = require('sinon');
 var clone = require('clone');
+var util = require("util");
+
 var Flow = require("../../../red/nodes/Flow");
+var flows = require("../../../red/nodes/flows");
+var Node = require("../../../red/nodes/Node");
 
 var typeRegistry = require("../../../red/nodes/registry");
 var credentials = require("../../../red/nodes/credentials");
@@ -216,8 +220,10 @@ describe('Flow', function() {
         });
         
         it('identifies nodes with changed properties, including downstream linked', function() {
-            var config =    [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
-            var newConfig = [{id:"1",type:"test",foo:"b",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var config = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[0].foo = "b";
+            
             var flow = new Flow(config);
             flow.getMissingTypes().should.have.length(0);
             
@@ -231,7 +237,9 @@ describe('Flow', function() {
         
         it('identifies nodes with changed properties, including upstream linked', function() {
             var config =    [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
-            var newConfig = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"c",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].bar = "c";
+            
             var flow = new Flow(config);
             flow.getMissingTypes().should.have.length(0);
             
@@ -242,10 +250,28 @@ describe('Flow', function() {
             diffResult.should.have.property("linked",["1"]);
             diffResult.should.have.property("wiringChanged",[]);
         });
+                
+        it('identifies nodes with changed credentials, including downstream linked', function() {
+            var config =    [{id:"1",type:"test",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[0].credentials = {};
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["1"]);
+            diffResult.should.have.property("linked",["2"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
         
         it('identifies nodes with changed wiring', function() {
-            var config = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
-            var newConfig = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[2]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var config =    [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].wires[0][0] = 2;
+            
             var flow = new Flow(config);
             flow.getMissingTypes().should.have.length(0);
             
@@ -258,8 +284,10 @@ describe('Flow', function() {
         });
         
         it('identifies nodes with changed wiring - second connection added', function() {
-            var config = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
-            var newConfig = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1],[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var config =    [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].wires[0].push([1]);
+            
             var flow = new Flow(config);
             flow.getMissingTypes().should.have.length(0);
             
@@ -271,9 +299,11 @@ describe('Flow', function() {
             diffResult.should.have.property("wiringChanged",["2"]);
         });
         
-        it('identifies nodes with changed wiring - second connection removed', function() {
-            var config = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1],[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
-            var newConfig = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+                it('identifies nodes with changed wiring - second connection added', function() {
+            var config =    [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].wires[0].push([1]);
+            
             var flow = new Flow(config);
             flow.getMissingTypes().should.have.length(0);
             
@@ -284,10 +314,28 @@ describe('Flow', function() {
             diffResult.should.have.property("linked",["1","2"]);
             diffResult.should.have.property("wiringChanged",["2"]);
         });
+
+        it('identifies nodes with changed wiring - node connected', function() {
+            var config =  [{id:"1",type:"test",foo:"a",wires:[["2"]]},{id:"2",type:"test",bar:"b",wires:[[]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].wires.push("3");
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",[]);
+            diffResult.should.have.property("linked",["1","2","3"]);
+            diffResult.should.have.property("wiringChanged",["2"]);
+        });
         
         it('identifies new nodes', function() {
             var config = [{id:"1",type:"test",foo:"a",wires:[]},{id:"3",type:"test",foo:"a",wires:[]}];
-            var newConfig = [{id:"1",type:"test",foo:"a",wires:[]},{id:"2",type:"test",bar:"b",wires:[[1]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig.push({id:"2",type:"test",bar:"b",wires:[[1]]});
+            
             var flow = new Flow(config);
             flow.getMissingTypes().should.have.length(0);
             
@@ -301,7 +349,10 @@ describe('Flow', function() {
         
         it('identifies deleted nodes', function() {
             var config = [{id:"1",type:"test",foo:"a",wires:[[2]]},{id:"2",type:"test",bar:"b",wires:[[3]]},{id:"3",type:"test",foo:"a",wires:[]}];
-            var newConfig = [{id:"1",type:"test",foo:"a",wires:[]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = clone(config);
+            newConfig.splice(1,1);
+            newConfig[0].wires = [];
+            
             var flow = new Flow(config);
             flow.getMissingTypes().should.have.length(0);
             
@@ -312,5 +363,459 @@ describe('Flow', function() {
             diffResult.should.have.property("linked",["1","3"]);
             diffResult.should.have.property("wiringChanged",["1"]);
         });
+
+        it('identifies config nodes changes', function() {
+            var config = [{id:"1",type:"test",foo:"configNode",wires:[[2]]},{id:"2",type:"test",bar:"b",wires:[[3]]},{id:"3",type:"test",foo:"a",wires:[]},{id:"configNode",type:"testConfig"}];
+            var newConfig = clone(config);
+            newConfig[3].foo = "bar";
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["1","configNode"]);
+            diffResult.should.have.property("linked",["2","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+
+        it('marks a parent subflow as changed for an internal property change', function() {
+            var config = [
+                {id:"1",type:"test",wires:[[2]]},
+                {id:"2",type:"subflow:sf1",wires:[[3]]},
+                {id:"3",type:"test",wires:[]},
+                {id:"sf1",type:"subflow"},
+                {id:"sf1-1",z:"sf1",type:"test",foo:"a"},
+                {id:"4",type:"subflow:sf1"}
+            ];
+            
+            var newConfig = clone(config);
+            newConfig[4].foo = "b";
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["2","4"]);
+            diffResult.should.have.property("linked",["1","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+        
+        it('marks a parent subflow as changed for an internal wiring change', function() {
+            var config = [
+                {id:"1",type:"test",wires:[[2]]},
+                {id:"2",type:"subflow:sf1",wires:[[3]]},
+                {id:"3",type:"test",wires:[]},
+                {id:"sf1",type:"subflow"},
+                {id:"sf1-1",z:"sf1",type:"test"},
+                {id:"sf1-2",z:"sf1",type:"test"}
+            ];
+            
+            var newConfig = clone(config);
+            newConfig[4].wires = [["sf1-2"]];
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["2"]);
+            diffResult.should.have.property("linked",["1","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+        it('marks a parent subflow as changed for an internal node delete', function() {
+            var config = [
+                {id:"1",type:"test",wires:[[2]]},
+                {id:"2",type:"subflow:sf1",wires:[[3]]},
+                {id:"3",type:"test",wires:[]},
+                {id:"sf1",type:"subflow"},
+                {id:"sf1-1",z:"sf1",type:"test"},
+                {id:"sf1-2",z:"sf1",type:"test"}
+            ];
+            
+            var newConfig = clone(config);
+            newConfig.splice(5,1);
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["2"]);
+            diffResult.should.have.property("linked",["1","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+        it('marks a parent subflow as changed for an internal subflow wiring change - input removed', function() {
+            var config = [
+                {id:"1",type:"test",wires:[[2]]},
+                {id:"2",type:"subflow:sf1",wires:[[3]]},
+                {id:"3",type:"test",wires:[]},
+                {id:"sf1",type:"subflow","in": [{"wires": [{"id": "sf1-1"}]}],"out": [{"wires": [{"id": "sf1-2","port": 0}]}]},
+                {id:"sf1-1",z:"sf1",type:"test"},
+                {id:"sf1-2",z:"sf1",type:"test"}
+            ];
+            
+            var newConfig = clone(config);
+            newConfig[3].in[0].wires = [];
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["2"]);
+            diffResult.should.have.property("linked",["1","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+        it('marks a parent subflow as changed for an internal subflow wiring change - input added', function() {
+            var config = [
+                {id:"1",type:"test",wires:[[2]]},
+                {id:"2",type:"subflow:sf1",wires:[[3]]},
+                {id:"3",type:"test",wires:[]},
+                {id:"sf1",type:"subflow","in": [{"wires": [{"id": "sf1-1"}]}],"out": [{"wires": [{"id": "sf1-2","port": 0}]}]},
+                {id:"sf1-1",z:"sf1",type:"test"},
+                {id:"sf1-2",z:"sf1",type:"test"}
+            ];
+            
+            var newConfig = clone(config);
+            newConfig[3].in[0].wires.push({"id":"sf1-2"});
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["2"]);
+            diffResult.should.have.property("linked",["1","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+        
+        it('marks a parent subflow as changed for an internal subflow wiring change - output added', function() {
+            var config = [
+                {id:"1",type:"test",wires:[[2]]},
+                {id:"2",type:"subflow:sf1",wires:[[3]]},
+                {id:"3",type:"test",wires:[]},
+                {id:"sf1",type:"subflow","in": [{"wires": [{"id": "sf1-1"}]}],"out": [{"wires": [{"id": "sf1-2","port": 0}]}]},
+                {id:"sf1-1",z:"sf1",type:"test"},
+                {id:"sf1-2",z:"sf1",type:"test"}
+            ];
+            
+            var newConfig = clone(config);
+            newConfig[3].out[0].wires.push({"id":"sf1-2","port":0});
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["2"]);
+            diffResult.should.have.property("linked",["1","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+        
+        it('marks a parent subflow as changed for an internal subflow wiring change - output removed', function() {
+            var config = [
+                {id:"1",type:"test",wires:[[2]]},
+                {id:"2",type:"subflow:sf1",wires:[[3]]},
+                {id:"3",type:"test",wires:[]},
+                {id:"sf1",type:"subflow","in": [{"wires": [{"id": "sf1-1"}]}],"out": [{"wires": [{"id": "sf1-2","port": 0}]}]},
+                {id:"sf1-1",z:"sf1",type:"test"},
+                {id:"sf1-2",z:"sf1",type:"test"}
+            ];
+            
+            var newConfig = clone(config);
+            newConfig[3].out[0].wires = [];
+            
+            var flow = new Flow(config);
+            flow.getMissingTypes().should.have.length(0);
+            
+            var diffResult = flow.diffFlow(newConfig);
+        
+            diffResult.should.have.property("deleted",[]);
+            diffResult.should.have.property("changed",["2"]);
+            diffResult.should.have.property("linked",["1","3"]);
+            diffResult.should.have.property("wiringChanged",[]);
+        });
+          
+        
+    });
+    
+    describe('#applyConfig',function() {
+        var getType;
+        var getNode;
+        var flowsAdd;
+        var credentialsClean;
+        
+        var stoppedNodes = {};
+        var currentNodes = {};
+        
+        var TestNode = function(n) {
+            Node.call(this,n);
+            var node = this;
+            this.handled = 0;
+            this.stopped = false;
+            this.on('input',function(msg) {
+                node.handled++;
+                node.send(msg);
+            });
+            this.on('close',function() {
+                node.stopped = true;
+                stoppedNodes[node.id] = node;
+                delete currentNodes[node.id];
+            });
+        }
+        util.inherits(TestNode,Node);
+        
+
+        
+        
+        before(function() {
+            flowsAdd = sinon.stub(flows,"add",function(node) {
+                currentNodes[node.id] = node;
+            });
+            getNode = sinon.stub(flows,"get",function(id) {
+                return currentNodes[id];
+            });
+            getType = sinon.stub(typeRegistry,"get",function(type) {
+                return TestNode;
+            });
+            credentialsClean = sinon.stub(credentials,"clean",function(config){});
+                
+        });
+        after(function() {
+            getType.restore();
+            flowsAdd.restore();
+            credentialsClean.restore();
+            getNode.restore();
+        });
+        
+        beforeEach(function() {
+            currentNodes = {};
+            stoppedNodes = {};
+        });
+        
+        it("instantiates an initial configuration and stops it",function(done) {
+            var config = [{id:"1",type:"test",foo:"a",wires:["2"]},{id:"2",type:"test",bar:"b",wires:[["3"]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            
+            var flow = new Flow(config);
+            flow.start();
+            
+            currentNodes.should.have.a.property("1");
+            currentNodes.should.have.a.property("2");
+            currentNodes.should.have.a.property("3");
+            
+            currentNodes["1"].should.have.a.property("handled",0);
+            currentNodes["2"].should.have.a.property("handled",0);
+            currentNodes["3"].should.have.a.property("handled",0);
+            
+            
+            currentNodes["1"].receive({payload:"test"});
+                    
+            currentNodes["1"].should.have.a.property("handled",1);
+            currentNodes["2"].should.have.a.property("handled",1);
+            currentNodes["3"].should.have.a.property("handled",1);
+            
+            flow.stop().then(function() {
+                currentNodes.should.not.have.a.property("1");
+                currentNodes.should.not.have.a.property("2");
+                currentNodes.should.not.have.a.property("3");
+                stoppedNodes.should.have.a.property("1");
+                stoppedNodes.should.have.a.property("2");
+                stoppedNodes.should.have.a.property("3");
+                done();
+            });
+        });
+
+        it("stops all nodes on new full deploy",function(done) {
+            var config = [{id:"1",type:"test",foo:"a",wires:["2"]},{id:"2",type:"test",bar:"b",wires:[["3"]]},{id:"3",type:"test",foo:"a",wires:[]}];
+            var newConfig = [{id:"4",type:"test",foo:"a",wires:["5"]},{id:"5",type:"test",bar:"b",wires:[["6"]]},{id:"6",type:"test",foo:"a",wires:[]}];
+            
+            var flow = new Flow(config);
+            flow.start();
+            
+            currentNodes.should.have.a.property("1");
+            currentNodes.should.have.a.property("2");
+            currentNodes.should.have.a.property("3");
+            
+            flow.applyConfig(newConfig).then(function() {
+                currentNodes.should.not.have.a.property("1");
+                currentNodes.should.not.have.a.property("2");
+                currentNodes.should.not.have.a.property("3");
+                stoppedNodes.should.have.a.property("1");
+                stoppedNodes.should.have.a.property("2");
+                stoppedNodes.should.have.a.property("3");
+                
+                currentNodes.should.have.a.property("4");
+                currentNodes.should.have.a.property("5");
+                currentNodes.should.have.a.property("6");
+                done();
+            });
+        });
+        
+        it("stops only modified nodes on 'nodes' deploy",function(done) {
+            var config = [{id:"1",type:"test",name:"a",wires:["2"]},{id:"2",type:"test",name:"b",wires:[["3"]]},{id:"3",type:"test",name:"c",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].name = "B";
+            
+            var flow = new Flow(config);
+            flow.start();
+            
+            currentNodes.should.have.a.property("1");
+            currentNodes.should.have.a.property("2");
+            currentNodes.should.have.a.property("3");
+            currentNodes["2"].should.have.a.property("name","b");
+
+            currentNodes["1"].receive({payload:"test"});
+            currentNodes["1"].should.have.a.property("handled",1);
+            currentNodes["2"].should.have.a.property("handled",1);
+            currentNodes["3"].should.have.a.property("handled",1);
+
+            
+            flow.applyConfig(newConfig,"nodes").then(function() {
+                currentNodes.should.have.a.property("1");
+                currentNodes.should.have.a.property("2");
+                currentNodes.should.have.a.property("3");
+                currentNodes["2"].should.have.a.property("name","B");
+                
+                stoppedNodes.should.not.have.a.property("1");
+                stoppedNodes.should.have.a.property("2");
+                stoppedNodes.should.not.have.a.property("3");
+                stoppedNodes["2"].should.have.a.property("name","b");
+                
+                
+                currentNodes["1"].receive({payload:"test"});
+                currentNodes["1"].should.have.a.property("handled",2);
+                currentNodes["2"].should.have.a.property("handled",1);
+                currentNodes["3"].should.have.a.property("handled",2);
+
+                done();
+            });
+        });
+
+        it("stops only modified flows on 'flows' deploy",function(done) {
+            var config = [{id:"1",type:"test",name:"a",wires:["2"]},{id:"2",type:"test",name:"b",wires:[[]]},{id:"3",type:"test",name:"c",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].name = "B";
+            
+            var flow = new Flow(config);
+            flow.start();
+            
+            currentNodes.should.have.a.property("1");
+            currentNodes.should.have.a.property("2");
+            currentNodes.should.have.a.property("3");
+            currentNodes["2"].should.have.a.property("name","b");
+            
+            currentNodes["1"].receive({payload:"test"});
+            currentNodes["1"].should.have.a.property("handled",1);
+            currentNodes["2"].should.have.a.property("handled",1);
+            currentNodes["3"].should.have.a.property("handled",0);
+            
+            currentNodes["3"].receive({payload:"test"});
+            currentNodes["3"].should.have.a.property("handled",1);
+            
+            flow.applyConfig(newConfig,"flows").then(function() {
+                currentNodes.should.have.a.property("1");
+                currentNodes.should.have.a.property("2");
+                currentNodes.should.have.a.property("3");
+                currentNodes["2"].should.have.a.property("name","B");
+                
+                stoppedNodes.should.have.a.property("1");
+                stoppedNodes.should.have.a.property("2");
+                stoppedNodes.should.not.have.a.property("3");
+                
+                stoppedNodes["2"].should.have.a.property("name","b");
+                
+                currentNodes["1"].receive({payload:"test"});
+                currentNodes["1"].should.have.a.property("handled",1);
+                currentNodes["2"].should.have.a.property("handled",1);
+                
+                currentNodes["3"].receive({payload:"test"});
+                currentNodes["3"].should.have.a.property("handled",2);
+                
+                done();
+            });
+        });
+        
+        it("rewires otherwise unmodified nodes on 'nodes' deploy",function(done) {
+            var config = [{id:"1",type:"test",name:"a",wires:["2"]},{id:"2",type:"test",name:"b",wires:[[]]},{id:"3",type:"test",name:"c",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].wires[0].push("3");
+            
+            var flow = new Flow(config);
+            flow.start();
+            
+            currentNodes.should.have.a.property("1");
+            currentNodes.should.have.a.property("2");
+            currentNodes.should.have.a.property("3");
+            
+            currentNodes["1"].receive({payload:"test"});
+            currentNodes["1"].should.have.a.property("handled",1);
+            currentNodes["2"].should.have.a.property("handled",1);
+            currentNodes["3"].should.have.a.property("handled",0);
+            
+            flow.applyConfig(newConfig,"nodes").then(function() {
+                currentNodes.should.have.a.property("1");
+                currentNodes.should.have.a.property("2");
+                currentNodes.should.have.a.property("3");
+                
+                stoppedNodes.should.not.have.a.property("1");
+                stoppedNodes.should.not.have.a.property("2");
+                stoppedNodes.should.not.have.a.property("3");
+                
+                currentNodes["1"].receive({payload:"test"});
+                currentNodes["1"].should.have.a.property("handled",2);
+                currentNodes["2"].should.have.a.property("handled",2);
+                currentNodes["3"].should.have.a.property("handled",1);
+                
+                done();
+            });
+        });
+
+        it("stops rewired but otherwise unmodified nodes on 'flows' deploy",function(done) {
+            var config = [{id:"1",type:"test",name:"a",wires:["2"]},{id:"2",type:"test",name:"b",wires:[[]]},{id:"3",type:"test",name:"c",wires:[]}];
+            var newConfig = clone(config);
+            newConfig[1].wires[0].push("3");
+            
+            var flow = new Flow(config);
+            flow.start();
+            
+            currentNodes.should.have.a.property("1");
+            currentNodes.should.have.a.property("2");
+            currentNodes.should.have.a.property("3");
+            
+            currentNodes["1"].receive({payload:"test"});
+            currentNodes["1"].should.have.a.property("handled",1);
+            currentNodes["2"].should.have.a.property("handled",1);
+            currentNodes["3"].should.have.a.property("handled",0);
+            
+            flow.applyConfig(newConfig,"flows").then(function() {
+                currentNodes.should.have.a.property("1");
+                currentNodes.should.have.a.property("2");
+                currentNodes.should.have.a.property("3");
+                
+                stoppedNodes.should.have.a.property("1");
+                stoppedNodes.should.have.a.property("2");
+                stoppedNodes.should.have.a.property("3");
+                
+                currentNodes["1"].receive({payload:"test"});
+                currentNodes["1"].should.have.a.property("handled",1);
+                currentNodes["2"].should.have.a.property("handled",1);
+                currentNodes["3"].should.have.a.property("handled",1);
+                
+                done();
+            });
+        });
+        
+        
+        
+        
     });
 });
\ No newline at end of file