Merge pull request #402 from roshan04/support_multiple_cyp10_files

Support multiple cyp10 files

Author: rahuln-bs

bin/helpers/archiver.js

@@ -83,7 +83,12 @@ const archiveSpecs = (runSettings, filePath, excludeFiles, md5data) => {
     ) {
       if (runSettings.cypressTestSuiteType === Constants.CYPRESS_V10_AND_ABOVE_TYPE) {
         let cypressConfigFileString = fs.readFileSync(runSettings.cypressConfigFilePath, {encoding: "utf-8"});
-        archive.append(cypressConfigFileString, {name: `${cypressAppendFilesZipLocation}${runSettings.cypress_config_filename}`});
+        for (const possibleCypressFileName of Constants.CYPRESS_CONFIG_FILE_NAMES) {
+          if (path.extname(runSettings.cypress_config_filename) == path.extname(possibleCypressFileName)) {
+            archive.append(cypressConfigFileString, {name: `${cypressAppendFilesZipLocation}${possibleCypressFileName}`});
+            break;
+          }
+        }
       } else if (runSettings.cypressTestSuiteType === Constants.CYPRESS_V9_AND_OLDER_TYPE) {
         let cypressJSON = JSON.parse(fs.readFileSync(runSettings.cypressConfigFilePath));
         let cypressJSONString = JSON.stringify(cypressJSON, null, 4);

bin/helpers/capabilityHelper.js

@@ -250,7 +250,7 @@ const validate = (bsConfig, args) => {
     let listOfFiles = fs.readdirSync(cypressFileDirectory);
     let configFilesPresent = [];
     for (const possibleCypressFileName of Constants.CYPRESS_CONFIG_FILE_NAMES) {
-      if (listOfFiles.includes(possibleCypressFileName)) {
+      if (listOfFiles.includes(possibleCypressFileName) || path.extname(possibleCypressFileName) == path.extname(bsConfig.run_settings.cypress_config_filename)) {
         configFilesPresent.push(possibleCypressFileName);
       }
     }

bin/helpers/utils.js

@@ -308,14 +308,14 @@ exports.setCypressConfigFilename = (bsConfig, args) => {
   }
 
   logger.debug(`Setting cypress config file path = ${bsConfig.run_settings.cypressConfigFilePath}`);
-  logger.debug(`Setting cypress project dir = ${bsConfig.run_settings.cypressProjDir}`);
+  logger.debug(`Setting cypress project dir = ${bsConfig.run_settings.cypressProjectDir}`);
 }
 
 exports.setCypressTestSuiteType = (bsConfig) => {
   for (const possibleCypressFileName of Constants.CYPRESS_CONFIG_FILE_NAMES) {
     if (bsConfig.run_settings.cypressConfigFilePath && 
         typeof(bsConfig.run_settings.cypressConfigFilePath) === 'string' && 
-        bsConfig.run_settings.cypressConfigFilePath.endsWith(possibleCypressFileName)) {
+        (path.extname(bsConfig.run_settings.cypressConfigFilePath) == path.extname(possibleCypressFileName) || bsConfig.run_settings.cypressConfigFilePath.endsWith(possibleCypressFileName))) {
           bsConfig.run_settings.cypressTestSuiteType = Constants.CYPRESS_CONFIG_FILE_MAPPING[possibleCypressFileName].type;
           break;
     }

bin/runner.js

@@ -136,7 +136,7 @@ var argv = yargs
         'ccf': {
           alias: 'cypress-config-file',
           describe: Constants.cliMessages.RUN.CYPRESS_DESC,
-          default: './cypress.config.js',
+          default: './cypress.json',
           type: 'string',
           nargs: 1,
           demand: true,

test/unit/bin/helpers/utils.js

@@ -1881,9 +1881,7 @@ describe('utils', () => {
 
     it('by default assumes that CYPRESS_V9_AND_OLDER_TYPE is the test suite type', () => {
       bsConfig = {
-        run_settings: {
-          cypressConfigFilePath: 'anyOtherFile.js',
-        },
+        run_settings: {},
       };
       utils.setCypressTestSuiteType(bsConfig);
       expect(bsConfig.run_settings.cypressTestSuiteType).to.be.eq(Contants.CYPRESS_V9_AND_OLDER_TYPE);