3.2.0/5.2.0 - fixed zip folder bug by admzip lib

- external version 3.2.0
- internal version 5.2.0 for code change - no API change

- fixed the zip folder bug when sending the blueprint to cloudify
  = this bug was preventing the opening of the blueprint
    in cloudify UI because the folder record was not properly
    formatted by admzip lib 0.4.7
- upgraded adm-zip lib to the latest version 0.4.13

- unit tested the zipping of the blueprint file under subfolder
  without having the subfolder record in zip
  = manual unzip in linux shows proper subfolder/file structure
  = automatic unzip is not supported by the old ubuntu
  = would need upgrading the node.js/ubuntu and installing unzip
    for proper testing - see code comments in unit-test

- zip file created by admzip unzips properly both in linux
  and in Windows
  = zip still has some header warnings, but not critical

unit test coverage summary
Statements   : 80.94% ( 943/1165 )
Branches     : 58.22% ( 294/505 )
Functions    : 81.28% ( 165/203 )
Lines        : 81.48% ( 933/1145 )

Change-Id: I48e44f025c21ef51de5a7422c8db9433581c787f
Signed-off-by: Alex Shatov <alexs@att.com>
Issue-ID: DCAEGEN2-855

1 files changed, 6 insertions, 2 deletions

diff --git a/tests/mock_deployment_handler.js b/tests/mock_deployment_handler.js
index 7407e55..5ed1985 100644
--- a/tests/mock_deployment_handler.js
+++ b/tests/mock_deployment_handler.js
@@ -1,5 +1,5 @@
 /*
-Copyright(c) 2018 AT&T Intellectual Property. All rights reserved.
+Copyright(c) 2018-2019 AT&T Intellectual Property. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,10 +24,12 @@ const nock = require('nock');
 const utils = require('./mock_utils');
 
 const MAIN_PATH = './../';
+const LOG_PATH = './log/';
 
 const CONSUL_URL = 'http://consul:8500';
 const MOCK_CLOUDIFY_MANAGER = "mock_cloudify_manager";
 const CLOUDIFY_URL = "http://" + MOCK_CLOUDIFY_MANAGER + ":80";
+const CLOUDIFY_API = "/api/v2.1";
 
 const MOCK_INVENTORY = "mock_inventory";
 const INVENTORY_URL = "https://" + MOCK_INVENTORY + ":8080";
@@ -45,7 +47,7 @@ nock(CONSUL_URL).persist().get('/v1/catalog/service/cloudify_manager')
         "NodeMeta":{},
         "ServiceID":"cloudify_manager",
         "ServiceName":"cloudify_manager",
-        "ServiceTags":["http://" + MOCK_CLOUDIFY_MANAGER + "/api/v2.1"],
+        "ServiceTags":["http://" + MOCK_CLOUDIFY_MANAGER + CLOUDIFY_API],
         "ServiceAddress": MOCK_CLOUDIFY_MANAGER,
         "ServicePort":80,
         "ServiceEnableTagOverride":false,
@@ -99,5 +101,7 @@ const run_dh = function() {
 
 module.exports.INVENTORY_URL = INVENTORY_URL;
 module.exports.CLOUDIFY_URL = CLOUDIFY_URL;
+module.exports.CLOUDIFY_API = CLOUDIFY_API;
+module.exports.LOG_PATH = LOG_PATH;
 module.exports.add_tests = function(new_tests) {Array.prototype.push.apply(tests, new_tests);};
 module.exports.run_dh = run_dh;