Add tests and syntax fix

Author: nagpalkaran95

bin/helpers/archiver.js

@@ -3,7 +3,8 @@ const fs = require("fs");
 
 const archiver = require("archiver"),
   Constants = require('../helpers/constants'),
-  logger = require("./logger").winstonLogger;
+  logger = require("./logger").winstonLogger,
+  utils = require('../helpers/utils');
 
 const archiveSpecs = (runSettings, filePath, excludeFiles) => {
   return new Promise(function (resolve, reject) {
@@ -37,18 +38,8 @@ const archiveSpecs = (runSettings, filePath, excludeFiles) => {
 
     archive.pipe(output);
 
-    let ignoreFiles = Constants.filesToIgnoreWhileUploading;
-
-    // exclude files asked by the user
-    // args will take precedence over config file
-    if (!Utils.isUndefined(excludeFiles)) {
-      ignoreFiles = ignoreFile.concat(Utils.fixCommaSeparatedString(excludeFiles).split(','));
-    } else if (!Utils.isUndefined(runSettings.exclude)) {
-      ignoreFiles = ignoreFile.concat(excludeFiles);
-    }
-
     Constants.allowedFileTypes.forEach(fileType => {
-      archive.glob(`**/*.${fileType}`, { cwd: cypressFolderPath, matchBase: true, ignore: ignoreFiles });
+      archive.glob(`**/*.${fileType}`, { cwd: cypressFolderPath, matchBase: true, ignore: getFilesToIgnore(runSettings, excludeFiles) });
     });
 
     let packageJSON = {};
@@ -70,4 +61,18 @@ const archiveSpecs = (runSettings, filePath, excludeFiles) => {
   });
 }
 
+const getFilesToIgnore = (runSettings, excludeFiles) => {
+  let ignoreFiles = Constants.filesToIgnoreWhileUploading;
+
+  // exclude files asked by the user
+  // args will take precedence over config file
+  if (!utils.isUndefined(excludeFiles)) {
+    ignoreFiles = ignoreFiles.concat(utils.fixCommaSeparatedString(excludeFiles).split(','));
+  } else if (!utils.isUndefined(runSettings.exclude) && runSettings.exclude.length) {
+    ignoreFiles = ignoreFiles.concat(runSettings.exclude);
+  }
+
+  return ignoreFiles;
+}
+
 exports.archive = archiveSpecs

test/unit/bin/helpers/archiver.js

@@ -0,0 +1,57 @@
+const chai = require("chai"),
+  rewire = require("rewire"),
+  chaiAsPromised = require("chai-as-promised");
+
+const utils = require("../../../../bin/helpers/utils"),
+  Constants = require("../../../../bin/helpers/constants"),
+  logger = require("../../../../bin/helpers/logger").winstonLogger;
+
+chai.use(chaiAsPromised);
+logger.transports["console.info"].silent = true;
+
+const archiver = rewire("../../../../bin/helpers/archiver");
+
+_getFilesToIgnore = archiver.__get__("getFilesToIgnore");
+
+describe("archiver.js", () => {
+
+  describe("getFilesToIgnore", () => {
+    it("no args, no exclude in runSettings", () => {
+      chai.expect(_getFilesToIgnore({}, undefined)).to.be.eql(Constants.filesToIgnoreWhileUploading);
+    });
+
+    it("args passed, no exclude in runSettings", () => {
+      let excludeFiles = "file1.js, file2.json";
+      let argsToArray = utils.fixCommaSeparatedString(excludeFiles).split(',');
+      chai.expect(_getFilesToIgnore({}, excludeFiles)).to.be.eql(Constants.filesToIgnoreWhileUploading.concat(argsToArray));
+
+      excludeFiles = "file1.js,file2.json";
+      argsToArray = utils.fixCommaSeparatedString(excludeFiles).split(',');
+      chai.expect(_getFilesToIgnore({}, excludeFiles)).to.be.eql(Constants.filesToIgnoreWhileUploading.concat(argsToArray));
+
+      excludeFiles = " file1.js , file2.json ";
+      argsToArray = utils.fixCommaSeparatedString(excludeFiles).split(',');
+      chai.expect(_getFilesToIgnore({}, excludeFiles)).to.be.eql(Constants.filesToIgnoreWhileUploading.concat(argsToArray));
+    });
+
+    it("args passed, exclude added in runSettings", () => {
+      // args preceed over config file
+      let excludeFiles = "file1.js, file2.json ";
+      let argsToArray = utils.fixCommaSeparatedString(excludeFiles).split(',');
+
+      let runSettings = { exclude: [] };
+      chai.expect(_getFilesToIgnore(runSettings, excludeFiles)).to.be.eql(Constants.filesToIgnoreWhileUploading.concat(argsToArray));
+
+      runSettings = { exclude: ["sample1.js", "sample2.json"] };
+      chai.expect(_getFilesToIgnore(runSettings, excludeFiles)).to.be.eql(Constants.filesToIgnoreWhileUploading.concat(argsToArray));
+    });
+
+    it("no args, exclude added in runSettings", () => {
+      let runSettings = { exclude: [] };
+      chai.expect(_getFilesToIgnore(runSettings, undefined)).to.be.eql(Constants.filesToIgnoreWhileUploading);
+
+      runSettings = { exclude: ["sample1.js", "sample2.json"] };
+      chai.expect(_getFilesToIgnore(runSettings, undefined)).to.be.eql(Constants.filesToIgnoreWhileUploading.concat(runSettings.exclude));
+    });
+  });
+});