From bd76c092d9929aa69682767855ba47b1ccc627d8 Mon Sep 17 00:00:00 2001 From: ilanap Date: Mon, 19 Feb 2018 10:36:26 +0200 Subject: Fix for adding BDD prefixes for for download Change-Id: Id796408470330300f79120ba5d39987989aff206 Issue-ID: SDC-990 Signed-off-by: ilanap --- openecomp-bdd/stepDefinitions/world.js | 47 ++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 14 deletions(-) (limited to 'openecomp-bdd/stepDefinitions/world.js') diff --git a/openecomp-bdd/stepDefinitions/world.js b/openecomp-bdd/stepDefinitions/world.js index ba6d57a09b..fd7250548d 100644 --- a/openecomp-bdd/stepDefinitions/world.js +++ b/openecomp-bdd/stepDefinitions/world.js @@ -15,6 +15,10 @@ */ const { setWorldConstructor } = require('cucumber'); const config = require('../config.json'); +let localDevConfig = {}; +try { + localDevConfig = require('../devConfig.json'); +} catch (e) {} var {setDefaultTimeout} = require('cucumber'); /** @@ -32,19 +36,18 @@ var {setDefaultTimeout} = require('cucumber'); **/ class CustomWorld { constructor(options) { - this.context = {} - if (options.parameters && options.parameters.server) { - this.context.server = options.parameters.server; - } else if (process.env.SERVER) { - this.context.server = process.env.SERVER; + this.context = {}; + this.context.headers = {}; + if (localDevConfig.user) { + this.context.headers['USER_ID'] = localDevConfig.user; } else { - this.context.server = config.server; + this.context.headers['USER_ID'] = process.env.USER; + } + if (localDevConfig.server) { + this.context.server = localDevConfig.server; + } else { + this.context.server = process.env.SERVER; } - this.context.server = (config.protocol + '://' + this.context.server + ':' + config.port); - - - this.context.headers = {}; - this.context.headers['USER_ID'] = 'cs0008'; this.context.vlm = {id: null, versionId: null}; this.context.vsp = {id: null, versionId: null}; @@ -55,15 +58,31 @@ class CustomWorld { this.context.inputData = null; this.context.responseData = null; + this.context.defaultServerType = 'onboarding'; + this.context.prefix = config.prefix; + this.context.port = config.port; + this.context.protocol = config.protocol; this.setServer = function(server) { - this.context.server = (config.protocol + '://' + this.context.server + ':' + config.port); - } + this.context.server = server; + }; + + let context = this.context; + this.context.getUrlForType = (function(type) { + var that = context; + return function(type) { + let typeData = that[type]; + return (config.protocol + '://' + + that.server + ':' + + typeData.port + '/' + + typeData.prefix); + } + })(); setDefaultTimeout(60 * 1000); } } -setWorldConstructor(CustomWorld) +setWorldConstructor(CustomWorld); -- cgit 1.2.3-korg