diff --git a/red/api/index.js b/red/api/index.js index 4ed91af4e..f6aa8b974 100644 --- a/red/api/index.js +++ b/red/api/index.js @@ -54,7 +54,7 @@ function init(adminApp) { adminApp.get("/nodes/:mod",nodes.getModule); adminApp.put("/nodes/:mod",nodes.putModule); - adminApp.delete("/nodes/:id",nodes.delete); + adminApp.delete("/nodes/:mod",nodes.delete); adminApp.get("/nodes/:mod/:set",nodes.getSet); adminApp.put("/nodes/:mod/:set",nodes.putSet); diff --git a/red/api/nodes.js b/red/api/nodes.js index 0b1c87dd4..0a1ea7eb3 100644 --- a/red/api/nodes.js +++ b/red/api/nodes.js @@ -70,25 +70,19 @@ module.exports = { res.send(400,new Error("Settings unavailable").toString()); return; } - var id = req.params.id; - var removedNodes = []; + var mod = req.params.mod; try { - var node = redNodes.getNodeInfo(id); var promise = null; - if (!node) { - var module = redNodes.getNodeModuleInfo(id); - if (!module) { - res.send(404); - return; - } else { - promise = server.uninstallModule(id); - } + var module = redNodes.getNodeModuleInfo(mod); + if (!module) { + res.send(404); + return; } else { - promise = when.resolve([redNodes.removeNode(id)]).then(server.reportRemovedModules); + promise = server.uninstallModule(mod); } - promise.then(function(removedNodes) { - res.json(removedNodes); + promise.then(function() { + res.send(204); }).otherwise(function(err) { res.send(400,err.toString()); }); diff --git a/test/red/api/nodes_spec.js b/test/red/api/nodes_spec.js index 681b353ff..686b0dc0d 100644 --- a/test/red/api/nodes_spec.js +++ b/test/red/api/nodes_spec.js @@ -329,7 +329,7 @@ describe("nodes api", function() { }); describe('by module', function() { - it('uninstalls the module and returns node info', function(done) { + it('uninstalls the module', function(done) { var settingsAvailable = sinon.stub(settings,'available', function() { return true; }); @@ -345,7 +345,7 @@ describe("nodes api", function() { request(app) .del('/nodes/foo') - .expect(200) + .expect(204) .end(function(err,res) { settingsAvailable.restore(); getNodeInfo.restore(); @@ -354,7 +354,6 @@ describe("nodes api", function() { if (err) { throw err; } - res.body.should.have.property("id","123"); done(); }); });