SOme UT fix

Author: prajwaldhawarikar-bs

bin/helpers/capabilityHelper.js

@@ -197,24 +197,26 @@ const validate = (bsConfig, args) => {
 
     logger.debug(`Validating ${bsConfig.run_settings.cypress_config_filename}`);
     try {
-      if (bsConfig.run_settings.cypressTestSuiteType === Constants.CYPRESS_V10_AND_ABOVE_TYPE) {
-        const completeCypressConfigFile = readCypressConfigFile(bsConfig)
-        if (!Utils.isUndefined(completeCypressConfigFile)) {
-          // check if cypress config was exported using export default
-          cypressConfigFile = !Utils.isUndefined(completeCypressConfigFile.default) ? completeCypressConfigFile.default : completeCypressConfigFile
-        }
+      if (bsConfig.run_settings.cypress_config_filename !== 'false') {
+        if (bsConfig.run_settings.cypressTestSuiteType === Constants.CYPRESS_V10_AND_ABOVE_TYPE) {
+          const completeCypressConfigFile = readCypressConfigFile(bsConfig)
+          if (!Utils.isUndefined(completeCypressConfigFile)) {
+            // check if cypress config was exported using export default
+            cypressConfigFile = !Utils.isUndefined(completeCypressConfigFile.default) ? completeCypressConfigFile.default : completeCypressConfigFile
+          }
 
-        // TODO: add validations for cypress_config_filename
-      } else {
-        let cypressJsonContent = fs.readFileSync(cypressConfigFilePath);
-        cypressConfigFile = JSON.parse(cypressJsonContent);
-      }
+          // TODO: add validations for cypress_config_filename
+        } else {
+          let cypressJsonContent = fs.readFileSync(cypressConfigFilePath);
+          cypressConfigFile = JSON.parse(cypressJsonContent);
+        }
 
-      // Cypress Json Base Url & Local true check
-      if (!Utils.isUndefined(cypressConfigFile.baseUrl) && cypressConfigFile.baseUrl.includes("localhost") && !Utils.getLocalFlag(bsConfig.connection_settings)) reject(Constants.validationMessages.LOCAL_NOT_SET.replace("<baseUrlValue>", cypressConfigFile.baseUrl));
+        // Cypress Json Base Url & Local true check
+        if (!Utils.isUndefined(cypressConfigFile.baseUrl) && cypressConfigFile.baseUrl.includes("localhost") && !Utils.getLocalFlag(bsConfig.connection_settings)) reject(Constants.validationMessages.LOCAL_NOT_SET.replace("<baseUrlValue>", cypressConfigFile.baseUrl));
 
-      // Detect if the user is not using the right directory structure, and throw an error
-      if (!Utils.isUndefined(cypressConfigFile.integrationFolder) && !Utils.isCypressProjDirValid(bsConfig.run_settings.cypressProjectDir,cypressConfigFile.integrationFolder)) reject(Constants.validationMessages.INCORRECT_DIRECTORY_STRUCTURE);
+        // Detect if the user is not using the right directory structure, and throw an error
+        if (!Utils.isUndefined(cypressConfigFile.integrationFolder) && !Utils.isCypressProjDirValid(bsConfig.run_settings.cypressProjectDir,cypressConfigFile.integrationFolder)) reject(Constants.validationMessages.INCORRECT_DIRECTORY_STRUCTURE);
+      }
     } catch(error){
       reject(Constants.validationMessages.INVALID_CYPRESS_JSON)
     }

test/unit/bin/helpers/packageInstaller.js

@@ -456,10 +456,8 @@ describe("packageInstaller", () => {
     });
 
     it("should reject with error if issue in any step", () => {
-      setupPackageFolderErrorStub = sandbox.stub().returns(Promise.reject({message: "test error", stack: "test error stack"}));
+      setupPackageArchiverErrorStub = sandbox.stub().returns(Promise.reject({message: "test error", stack: "test error stack"}));
       packageInstaller.__set__({
-        setupPackageFolder: setupPackageFolderErrorStub,
-        packageInstall:setupPackageInstallStub,
         packageArchiver: setupPackageArchiverStub
       });
       let packageWrapperrewire = packageInstaller.__get__('packageWrapper');

test/unit/bin/helpers/utils.js

@@ -2257,7 +2257,7 @@ describe('utils', () => {
 
   describe('getNumberOfSpecFiles', () => {
     it('glob search pattern should be equal to bsConfig.run_settings.specs', () => {
-      let getNumberOfSpecFilesStub = sinon.stub(glob, 'sync');
+      let getNumberOfSpecFilesStub = sinon.stub(glob, 'sync').returns([]);
       let bsConfig = {
         run_settings: {
           specs: 'specs',
@@ -2277,7 +2277,7 @@ describe('utils', () => {
     });
 
     it('glob search pattern should be equal to default', () => {
-      let getNumberOfSpecFilesStub = sinon.stub(glob, 'sync');
+      let getNumberOfSpecFilesStub = sinon.stub(glob, 'sync').returns([]);
       let bsConfig = {
         run_settings: {
           cypressProjectDir: 'cypressProjectDir',
@@ -3343,26 +3343,23 @@ describe('utils', () => {
         }
       }
       let args = {};
-      getCypressConfigFileStub.returns({ projectId: "ghi" })
-      expect(utils.setProjectId(bsConfig, args)).to.eq("abc")
+      expect(utils.setProjectId(bsConfig, args, { projectId: "ghi" })).to.eq("abc")
     });
 
     it("prioritizes projectId passed in cypress json when no args, env var and bsConfig is passed", () => {
       let bsConfig = {
         run_settings: {}
       }
       let args = {}
-      getCypressConfigFileStub.returns({ projectId: "ghi" })
-      expect(utils.setProjectId(bsConfig, args)).to.eq("ghi")
+      expect(utils.setProjectId(bsConfig, args, { projectId: "ghi" })).to.eq("ghi")
     });
 
     it("returns undefined when nothing is passed", () => {
       let bsConfig = {
         run_settings: {}
       }
       let args = {}
-      getCypressConfigFileStub.returns({})
-      expect(utils.setProjectId(bsConfig, args)).to.eq(undefined)
+      expect(utils.setProjectId(bsConfig, args, {})).to.eq(undefined)
     });
   });
 

test/unit/bin/helpers/zipUpload.js

@@ -94,7 +94,8 @@ describe("zipUpload", () => {
       let opts = {
         urlPresent: true,
         md5ReturnKey: 'returnKey',
-        url: 'bs://random_hash'
+        url: 'bs://random_hash',
+        cleanupMethod: sinon.stub().returns(null)
       }
       let obj = {
         bar1: null,