From a046b357dac69c22361ec18069b80f2e934122f4 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 5 Mar 2019 13:24:35 +0000 Subject: [PATCH] Tidy up registry/loader api used by unit tests Fixes #2073 --- packages/node_modules/@node-red/registry/lib/loader.js | 4 ++-- test/unit/@node-red/registry/lib/loader_spec.js | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js index ebc814b61..09589c80a 100644 --- a/packages/node_modules/@node-red/registry/lib/loader.js +++ b/packages/node_modules/@node-red/registry/lib/loader.js @@ -34,14 +34,14 @@ function init(_runtime) { registryUtil.init(runtime); } -function load(defaultNodesDir,disableNodePathScan) { +function load(disableNodePathScan) { // To skip node scan, the following line will use the stored node list. // We should expose that as an option at some point, although the // performance gains are minimal. //return loadNodeFiles(registry.getModuleList()); runtime.log.info(runtime.log._("server.loading")); - var nodeFiles = localfilesystem.getNodeFiles(defaultNodesDir,disableNodePathScan); + var nodeFiles = localfilesystem.getNodeFiles(disableNodePathScan); return loadNodeFiles(nodeFiles); } diff --git a/test/unit/@node-red/registry/lib/loader_spec.js b/test/unit/@node-red/registry/lib/loader_spec.js index 3eb83dfd8..9ab2e0081 100644 --- a/test/unit/@node-red/registry/lib/loader_spec.js +++ b/test/unit/@node-red/registry/lib/loader_spec.js @@ -50,10 +50,9 @@ describe("red/nodes/registry/loader",function() { stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){ return {};})); stubs.push(sinon.stub(registry,"saveNodeList", function(){ return {};})); loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return false;}}}); - loader.load("foo",true).then(function() { + loader.load(true).then(function() { localfilesystem.getNodeFiles.called.should.be.true(); - localfilesystem.getNodeFiles.lastCall.args[0].should.eql('foo'); - localfilesystem.getNodeFiles.lastCall.args[1].should.be.true(); + localfilesystem.getNodeFiles.lastCall.args[0].should.be.true(); registry.saveNodeList.called.should.be.false(); done(); }) @@ -62,7 +61,7 @@ describe("red/nodes/registry/loader",function() { stubs.push(sinon.stub(localfilesystem,"getNodeFiles", function(){ return {};})); stubs.push(sinon.stub(registry,"saveNodeList", function(){ return {};})); loader.init({nodes:nodes,log:{info:function(){},_:function(){}},settings:{available:function(){return true;}}}); - loader.load("foo",true).then(function() { + loader.load(true).then(function() { registry.saveNodeList.called.should.be.true(); done(); }).catch(function(err) {