frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fully remove when.js dependency

Browse Source
This commit is contained in:
Nick O'Leary
2020-11-30 14:38:48 +00:00
parent beccdac717
commit 5992ed1fab
49 changed files with 299 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
test/unit/@node-red/runtime/lib/api/nodes_spec.js
View File

@@ -185,7 +185,6 @@ var request = require('supertest');
var express = require('express');
var bodyParser = require('body-parser');
var sinon = require('sinon');
var when = require('when');
var nodes = require("../../../../red/api/admin/nodes");
var apiUtil = require("../../../../red/api/util");
@@ -418,7 +417,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return null; },
installModule: function() {
return when.resolve({
return Promise.resolve({
name:"foo",
nodes:[{id:"123"}]
});
@@ -446,7 +445,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return {nodes:{id:"123"}}; },
installModule: function() {
return when.resolve({id:"123"});
return Promise.resolve({id:"123"});
}
}
});
@@ -468,7 +467,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return null },
installModule: function() {
return when.reject(new Error("test error"));
return Promise.reject(new Error("test error"));
}
}
});
@@ -492,7 +491,7 @@ describe("api/admin/nodes", function() {
installModule: function() {
var err = new Error("test error");
err.code = 404;
return when.reject(err);
return Promise.reject(err);
}
}
});
@@ -533,7 +532,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return {nodes:[{id:"123"}]} },
getNodeInfo: function() { return null },
uninstallModule: function() { return when.resolve({id:"123"});}
uninstallModule: function() { return Promise.resolve({id:"123"});}
}
});
request(app)
@@ -572,7 +571,7 @@ describe("api/admin/nodes", function() {
nodes:{
getModuleInfo: function(id) { return {nodes:[{id:"123"}]} },
getNodeInfo: function() { return null },
uninstallModule: function() { return when.reject(new Error("test error"));}
uninstallModule: function() { return Promise.reject(new Error("test error"));}
}
});
request(app)
@@ -686,7 +685,7 @@ describe("api/admin/nodes", function() {
settings:{available:function(){return true}},
nodes:{
getNodeInfo: function() { return {id:"123",enabled: false} },
enableNode: function() { return when.resolve({id:"123",enabled: true,types:['a']}); }
enableNode: function() { return Promise.resolve({id:"123",enabled: true,types:['a']}); }
}
});
request(app)
@@ -709,7 +708,7 @@ describe("api/admin/nodes", function() {
settings:{available:function(){return true}},
nodes:{
getNodeInfo: function() { return {id:"123",enabled: true} },
disableNode: function() { return when.resolve({id:"123",enabled: false,types:['a']}); }
disableNode: function() { return Promise.resolve({id:"123",enabled: false,types:['a']}); }
}
});
request(app)
@@ -729,8 +728,8 @@ describe("api/admin/nodes", function() {
describe('no-ops if already in the right state', function() {
function run(state,done) {
var enableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: false,types:['a']}) });
var enableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: false,types:['a']}) });
initNodes({
settings:{available:function(){return true}},
@@ -768,8 +767,8 @@ describe("api/admin/nodes", function() {
describe('does not no-op if err on node', function() {
function run(state,done) {
var enableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return when.resolve({id:"123",enabled: false,types:['a']}) });
var enableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: true,types:['a']}) });
var disableNode = sinon.spy(function() { return Promise.resolve({id:"123",enabled: false,types:['a']}) });
initNodes({
settings:{available:function(){return true}},
@@ -811,11 +810,11 @@ describe("api/admin/nodes", function() {
var enableNode = sinon.stub();
enableNode.onFirstCall().returns((function() {
n1.enabled = true;
return when.resolve(n1);
return Promise.resolve(n1);
})());
enableNode.onSecondCall().returns((function() {
n2.enabled = true;
return when.resolve(n2);
return Promise.resolve(n2);
})());
enableNode.returns(null);
initNodes({
@@ -849,11 +848,11 @@ describe("api/admin/nodes", function() {
var disableNode = sinon.stub();
disableNode.onFirstCall().returns((function() {
n1.enabled = false;
return when.resolve(n1);
return Promise.resolve(n1);
})());
disableNode.onSecondCall().returns((function() {
n2.enabled = false;
return when.resolve(n2);
return Promise.resolve(n2);
})());
disableNode.returns(null);
initNodes({
@@ -886,11 +885,11 @@ describe("api/admin/nodes", function() {
var node = {id:"123",enabled:state,types:['a']};
var enableNode = sinon.spy(function(id) {
node.enabled = true;
return when.resolve(node);
return Promise.resolve(node);
});
var disableNode = sinon.spy(function(id) {
node.enabled = false;
return when.resolve(node);
return Promise.resolve(node);
});
initNodes({
@@ -933,11 +932,11 @@ describe("api/admin/nodes", function() {
var node = {id:"123",enabled:state,types:['a'],err:"foo"};
var enableNode = sinon.spy(function(id) {
node.enabled = true;
return when.resolve(node);
return Promise.resolve(node);
});
var disableNode = sinon.spy(function(id) {
node.enabled = false;
return when.resolve(node);
return Promise.resolve(node);
});
initNodes({

5
test/unit/@node-red/runtime/lib/api/settings_spec.js
View File

@@ -588,7 +588,6 @@ var comms = require("../../../../red/api/editor/comms");
var info = require("../../../../red/api/editor/settings");
var auth = require("../../../../red/api/auth");
var sshkeys = require("../../../../red/api/editor/sshkeys");
var when = require("when");
var bodyParser = require("body-parser");
var fs = require("fs-extra");
var fspath = require("path");
@@ -611,11 +610,11 @@ describe("api/editor/sshkeys", function() {
exportNodeSettings:function(){},
storage: {
getSessions: function(){
return when.resolve(session_data);
return Promise.resolve(session_data);
},
setSessions: function(_session) {
session_data = _session;
return when.resolve();
return Promise.resolve();
}
}
},

41
test/unit/@node-red/runtime/lib/flows/index_spec.js
View File

@@ -16,7 +16,6 @@
var should = require("should");
var sinon = require("sinon");
var when = require("when");
var clone = require("clone");
var NR_TEST_UTILS = require("nr-test-utils");
@@ -65,13 +64,13 @@ describe('flows/index', function() {
conf.forEach(function(n) {
delete n.credentials;
});
return when.resolve();
return Promise.resolve();
});
credentialsLoad = sinon.stub(credentials,"load",function(creds) {
if (creds && creds.hasOwnProperty("$") && creds['$'] === "fail") {
return when.reject("creds error");
return Promise.reject("creds error");
}
return when.resolve();
return Promise.resolve();
});
flowCreate = sinon.stub(Flow,"create",function(parent, global, flow) {
var id;
@@ -101,7 +100,7 @@ describe('flows/index', function() {
storage = {
saveFlows: function(conf) {
storage.conf = conf;
return when.resolve();
return Promise.resolve();
}
}
});
@@ -145,10 +144,10 @@ describe('flows/index', function() {
var loadStorage = {
saveFlows: function(conf) {
loadStorage.conf = conf;
return when.resolve(456);
return Promise.resolve(456);
},
getFlows: function() {
return when.resolve({flows:originalConfig,rev:123})
return Promise.resolve({flows:originalConfig,rev:123})
}
}
flows.init({log:mockLog, settings:{},storage:loadStorage});
@@ -207,7 +206,7 @@ describe('flows/index', function() {
newConfig.push({id:"t2",type:"tab"});
newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
events.once('flows:started',function() {
flows.setFlows(newConfig,"nodes").then(function() {
@@ -235,7 +234,7 @@ describe('flows/index', function() {
newConfig.push({id:"t2",type:"tab"});
newConfig.push({id:"t2-1",x:10,y:10,z:"t2",type:"test",wires:[]});
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
events.once('flows:started',function() {
@@ -277,7 +276,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@@ -297,7 +296,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
events.once('flows:started',function() {
@@ -317,7 +316,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
@@ -336,7 +335,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@@ -370,7 +369,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@@ -394,7 +393,7 @@ describe('flows/index', function() {
// {id:"t1",type:"tab"}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@@ -419,7 +418,7 @@ describe('flows/index', function() {
// {id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@@ -447,7 +446,7 @@ describe('flows/index', function() {
// {id:"t1",type:"tab"}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@@ -473,7 +472,7 @@ describe('flows/index', function() {
// {id:"t3-1",x:10,y:10,z:"t3",type:"test",config:"configNode",wires:[]}
// ];
// storage.getFlows = function() {
// return when.resolve({flows:originalConfig});
// return Promise.resolve({flows:originalConfig});
// }
//
// events.once('flows:started',function() {
@@ -548,7 +547,7 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {
@@ -572,10 +571,10 @@ describe('flows/index', function() {
{id:"t1",type:"tab"}
];
storage.getFlows = function() {
return when.resolve({flows:originalConfig});
return Promise.resolve({flows:originalConfig});
}
storage.setFlows = function() {
return when.resolve();
return Promise.resolve();
}
flows.init({log:mockLog, settings:{},storage:storage});
flows.load().then(function() {

1
test/unit/@node-red/runtime/lib/flows/util_spec.js
View File

@@ -16,7 +16,6 @@
var should = require("should");
var sinon = require("sinon");
var when = require("when");
var clone = require("clone");
var NR_TEST_UTILS = require("nr-test-utils");
var flowUtil = NR_TEST_UTILS.require("@node-red/runtime/lib/flows/util");

5
test/unit/@node-red/runtime/lib/nodes/credentials_spec.js
View File

@@ -16,7 +16,6 @@
var should = require("should");
var sinon = require("sinon");
var when = require("when");
var util = require("util");
var NR_TEST_UTILS = require("nr-test-utils");
@@ -228,11 +227,11 @@ describe('red/runtime/nodes/credentials', function() {
},
set: function(key,value) {
settings[key] = value;
return when.resolve();
return Promise.resolve();
},
delete: function(key) {
delete settings[key];
return when.resolve();
return Promise.resolve();
}
}
}

11
test/unit/@node-red/runtime/lib/nodes/index_spec.js
View File

@@ -17,7 +17,6 @@
var should = require("should");
var fs = require('fs-extra');
var path = require('path');
var when = require("when");
var sinon = require('sinon');
var inherits = require("util").inherits;
@@ -47,11 +46,11 @@ describe("red/nodes/index", function() {
var testCredentials = {"tab1":{"b":1, "c":"2", "d":"$(foo)"}};
var storage = {
getFlows: function() {
return when({red:123,flows:testFlows,credentials:testCredentials});
return Promise.resolve({red:123,flows:testFlows,credentials:testCredentials});
},
saveFlows: function(conf) {
should.deepEqual(testFlows, conf.flows);
return when.resolve(123);
return Promise.resolve(123);
}
};
@@ -182,12 +181,12 @@ describe("red/nodes/index", function() {
fs.remove(userDir,function(err) {
fs.mkdir(userDir,function() {
sinon.stub(index, 'load', function() {
return when.promise(function(resolve,reject){
return new Promise(function(resolve,reject){
resolve([]);
});
});
sinon.stub(localfilesystem, 'getCredentials', function() {
return when.promise(function(resolve,reject) {
return new Promise(function(resolve,reject) {
resolve({"tab1":{"b":1,"c":2}});
});
}) ;
@@ -282,7 +281,7 @@ describe("red/nodes/index", function() {
}
});
sinon.stub(registry,"disableNode",function(id) {
return when.resolve(randomNodeInfo);
return Promise.resolve(randomNodeInfo);
});
});
afterEach(function() {

17
test/unit/@node-red/runtime/lib/storage/index_spec.js
View File

@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
**/
var when = require("when");
var should = require("should");
var paff = require('path');
@@ -79,16 +78,16 @@ describe("red/storage/index", function() {
},
getFlows : function() {
calledFlagGetFlows = true;
return when.resolve([]);
return Promise.resolve([]);
},
saveFlows : function (flows) {
flows.should.be.an.Array();
flows.should.have.lengthOf(0);
return when.resolve("");
return Promise.resolve("");
},
getCredentials : function() {
calledFlagGetCredentials = true;
return when.resolve({});
return Promise.resolve({});
},
saveCredentials : function(credentials) {
credentials.should.be.true();
@@ -147,7 +146,7 @@ describe("red/storage/index", function() {
storage.getLibraryEntry(true, "name");
storage.saveLibraryEntry(true, "name", true, true);
when.settle(promises).then(function() {
Promise.all(promises).then(function() {
try {
calledInit.should.be.true();
calledFlagGetFlows.should.be.true();
@@ -174,11 +173,11 @@ describe("red/storage/index", function() {
getLibraryEntry : function(type, path) {
if (type === "flows") {
if (path === "/" || path === "\\") {
return when.resolve(["a",{fn:"test.json"}]);
return Promise.resolve(["a",{fn:"test.json"}]);
} else if (path == "/a" || path == "\\a") {
return when.resolve([{fn:"test2.json"}]);
return Promise.resolve([{fn:"test2.json"}]);
} else if (path == paff.join("","a","test2.json")) {
return when.resolve("test content");
return Promise.resolve("test content");
}
}
},
@@ -187,7 +186,7 @@ describe("red/storage/index", function() {
savePath = path;
saveContent = body;
saveMeta = meta;
return when.resolve();
return Promise.resolve();
}
};