diff options
| -rw-r--r-- | Dockerfile_UT | 4 | ||||
| -rw-r--r-- | deployment-handler.js | 35 | ||||
| -rw-r--r-- | package.json | 5 | ||||
| -rw-r--r-- | tests/test_policy.js | 7 |
4 files changed, 30 insertions, 21 deletions
diff --git a/Dockerfile_UT b/Dockerfile_UT index 3665bf2..265e1bd 100644 --- a/Dockerfile_UT +++ b/Dockerfile_UT @@ -30,5 +30,5 @@ RUN npm install \ USER ${APPUSER} VOLUME ${APPDIR}/log EXPOSE 8443 -# ENTRYPOINT ["/usr/local/bin/npm", "test"] -ENTRYPOINT ["/usr/local/bin/npm", "run", "test-cov"] +ENTRYPOINT ["/usr/local/bin/npm", "test"] +# ENTRYPOINT ["/usr/local/bin/npm", "run", "test-only"] diff --git a/deployment-handler.js b/deployment-handler.js index 171f73c..1d59733 100644 --- a/deployment-handler.js +++ b/deployment-handler.js @@ -36,24 +36,26 @@ const SWAGGER_UI_PATH = "/swagger-ui"; const app = express(); -/* Set up the application */ -app.set('x-powered-by', false); -app.set('etag', false); +const set_app = function() { + /* Set up the application */ + app.set('x-powered-by', false); + app.set('etag', false); -/* Give each request a unique request ID */ -app.use(require('./lib/middleware').assignId); + /* Give each request a unique request ID */ + app.use(require('./lib/middleware').assignId); -/* If authentication is set up, check it */ -app.use(require('./lib/auth').checkAuth); + /* If authentication is set up, check it */ + app.use(require('./lib/auth').checkAuth); -/* Set up API routes */ -app.use(INFO_PATH, require('./lib/info')); -app.use(DEPLOYMENTS_PATH, require('./lib/dcae-deployments')); -app.use(POLICY_PATH, require('./lib/policy')); -app.use(SWAGGER_UI_PATH, require('./lib/swagger-ui')); + /* Set up API routes */ + app.use(INFO_PATH, require('./lib/info')); + app.use(DEPLOYMENTS_PATH, require('./lib/dcae-deployments')); + app.use(POLICY_PATH, require('./lib/policy')); + app.use(SWAGGER_UI_PATH, require('./lib/swagger-ui')); -/* Set up error handling */ -app.use(require('./lib/middleware').handleErrors); + /* Set up error handling */ + app.use(require('./lib/middleware').handleErrors); +} const start = function(config) { @@ -77,6 +79,8 @@ const start = function(config) { log.debug(null, "Configuration: " + JSON.stringify(config)); + set_app(); + /* Start the server */ var server = null; var usingTLS = false; @@ -149,4 +153,5 @@ conf.configure() console.error("Deployment-handler exiting due to startup problem: " + e.message); }); -module.exports = app;
\ No newline at end of file +module.exports.app = app; +module.exports.set_app = set_app; diff --git a/package.json b/package.json index b6215cf..2a4f7e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "onap-dcae-deployment-handler", - "version": "4.2.1", + "version": "4.2.2", "description": "ONAP DCAE Deployment Handler", "main": "deployment-handler.js", "dependencies": { @@ -20,7 +20,8 @@ "nock": "^9.0.21" }, "scripts": { - "test": "mocha --reporter spec tests/", + "test": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter spec tests/", + "test-only": "mocha --reporter spec tests/", "test-ci": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec tests/", "test-cov": "istanbul cover node_modules/mocha/bin/_mocha -- --reporter dot tests/" }, diff --git a/tests/test_policy.js b/tests/test_policy.js index 3c1a5da..c0ad243 100644 --- a/tests/test_policy.js +++ b/tests/test_policy.js @@ -189,8 +189,11 @@ describe('test policy on deployment-handler', () => { console.log("got configuration:", JSON.stringify(config)); log.debug(REQ_ID, "Configuration: " + JSON.stringify(config)); + const main_app = require('./../deployment-handler'); - console.log("loaded main_app"); + console.log("setting main_app..."); + main_app.set_app(); + console.log("set main_app"); const req_path = "/policy/components"; const test_txt = "GET " + req_path; @@ -198,7 +201,7 @@ describe('test policy on deployment-handler', () => { console.log(test_txt); it('GET all the components with policy from cloudify', function() { console.log("chai", test_txt); - return chai.request(main_app).get(req_path) + return chai.request(main_app.app).get(req_path) .then(function(res) { console.log("res for", test_txt, JSON.stringify(res.body)); log.debug(REQ_ID, "received " + JSON.stringify(res.body)); |