From 378edd41869a84d32ad2ac3e36756ad2aa2ba4a5 Mon Sep 17 00:00:00 2001 From: Braydon Fuller Date: Tue, 3 Nov 2015 10:32:01 -0500 Subject: [PATCH] Web: Changed to pass express subapp to services instead of the router. --- lib/services/web.js | 2 +- test/services/web.unit.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/services/web.js b/lib/services/web.js index 42d0bcb7..af773b87 100644 --- a/lib/services/web.js +++ b/lib/services/web.js @@ -86,7 +86,7 @@ WebService.prototype.stop = function(callback) { */ WebService.prototype.setupAllRoutes = function() { for(var key in this.node.services) { - var subApp = new express.Router(); + var subApp = new express(); var service = this.node.services[key]; if(service.getRoutePrefix && service.setupRoutes) { diff --git a/test/services/web.unit.js b/test/services/web.unit.js index 736bed2d..4bc5760f 100644 --- a/test/services/web.unit.js +++ b/test/services/web.unit.js @@ -103,6 +103,10 @@ describe('WebService', function() { web.setupAllRoutes(); node.services.one.setupRoutes.callCount.should.equal(1); + should.exist(node.services.one.setupRoutes.args[0][0].engine); + should.exist(node.services.one.setupRoutes.args[0][0].get); + should.exist(node.services.one.setupRoutes.args[0][0].post); + should.exist(node.services.one.setupRoutes.args[0][0].set); node.services.two.setupRoutes.callCount.should.equal(1); }); }); @@ -368,4 +372,4 @@ describe('WebService', function() { }); }); -}); \ No newline at end of file +});