disable cache flag and cleanup

Author: sparsh0204

bin/commands/runs.js

@@ -99,7 +99,7 @@ module.exports = function run(args) {
         markBlockEnd('checkAlreadyUploaded');
 
         markBlockStart('packageInstaller');
-        return packageInstaller.packageWrappper(bsConfig, config.packageDirName, config.packageFileName, md5data, {markBlockStart, markBlockEnd}).then(function (packageData) {
+        return packageInstaller.packageWrapper(bsConfig, config.packageDirName, config.packageFileName, md5data, {markBlockStart, markBlockEnd}).then(function (packageData) {
           markBlockEnd('packageInstaller');
 
           // Archive the spec files
@@ -206,6 +206,11 @@ module.exports = function run(args) {
                 logger.error(Constants.userMessages.ZIP_UPLOAD_FAILED);
                 fileHelpers.deleteZip();
                 utils.sendUsageReport(bsConfig, args, `${err}\n${Constants.userMessages.ZIP_UPLOAD_FAILED}`, Constants.messageTypes.ERROR, 'zip_upload_failed');
+                try {
+                  fileHelpers.deletePackageArchieve();
+                } catch (err) {
+                  utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed');
+                }
               }
             });
           }).catch(function (err) {
@@ -218,12 +223,22 @@ module.exports = function run(args) {
             } catch (err) {
               utils.sendUsageReport(bsConfig, args, Constants.userMessages.ZIP_DELETE_FAILED, Constants.messageTypes.ERROR, 'zip_deletion_failed');
             }
+            try {
+              fileHelpers.deletePackageArchieve();
+            } catch (err) {
+              utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed');
+            }
           });
         }).catch(function (err) {
           // package installer failed
           logger.error(err);
           logger.error(Constants.userMessages.FAILED_CREATE_NPM_ARCHIVE);
           utils.sendUsageReport(bsConfig, args, Constants.userMessages.FAILED_CREATE_NPM_ARCHIVE, Constants.messageTypes.ERROR, 'npm_package_archive_failed');
+          try {
+            fileHelpers.deletePackageArchieve();
+          } catch (err) {
+            utils.sendUsageReport(bsConfig, args, Constants.userMessages.NPM_DELETE_FAILED, Constants.messageTypes.ERROR, 'npm_deletion_failed');
+          }
         });
       }).catch(function (err) {
         // md5 check failed

bin/helpers/checkUploaded.js

@@ -130,6 +130,14 @@ const checkUploadedMd5 = (bsConfig, args, instrumentBlocks) => {
               Object.assign(obj, zipData, {packageUrlPresent: true});
             }
           }
+          if (utils.isTrueString(zipData.disableNpmSuiteCache)) {
+            bsConfig.run_settings.cache_dependencies = false;
+            Object.assign(obj, {packageUrlPresent: false});
+          }
+          if (utils.isTrueString(zipData.disableTestSuiteCache)) {
+            args["force-upload"] = true;
+            Object.assign(obj, {zipUrlPresent: false});
+          }
           instrumentBlocks.markBlockEnd("checkAlreadyUploaded.railsCheck");
           resolve(obj);
         }

bin/helpers/constants.js

@@ -38,7 +38,9 @@ const userMessages = {
   NO_NPM_DEPENDENCIES_READ_MORE: "Read more about npm dependencies here: https://www.browserstack.com/docs/automate/cypress/npm-packages. You can suppress this warning by using --disable-npm-warning flag.",
   VALIDATING_CONFIG: "Validating the config",
   UPLOADING_TESTS: "Uploading the tests to BrowserStack",
+  UPLOADING_TESTS_SUCCESS: "Uploaded tests successfully",
   UPLOADING_NPM_PACKAGES: "Uploading required node_modules to BrowserStack",
+  UPLOADING_NPM_PACKAGES_SUCCESS: "Uploaded node_modules successfully",
   LOCAL_TRUE: "you will now be able to test localhost / private URLs",
   LOCAL_FALSE: "you won't be able to test localhost / private URLs",
   EXIT_SYNC_CLI_MESSAGE: "Exiting the CLI, but your build is still running. You can use the --sync option to keep getting test updates. You can also use the build-info <build-id> command now.",
@@ -160,6 +162,8 @@ const filesToIgnoreWhileUploading = [
   '.idea/**',
   '.vscode/**',
   '.npm/**',
+  'bstackPackages.tar.gz',
+  'tmpBstackPackages/**',
   '.yarn/**',
   'build_artifacts/**'
 ];

bin/helpers/packageInstaller.js

@@ -105,7 +105,7 @@ const packageArchiver = (packageDir, packageFile) => {
   })
 }
 
-const packageWrappper = (bsConfig, packageDir, packageFile, md5data, instrumentBlocks) => {
+const packageWrapper = (bsConfig, packageDir, packageFile, md5data, instrumentBlocks) => {
   return new Promise(function (resolve) {
     let obj = {
       packageArchieveCreated: false
@@ -129,10 +129,10 @@ const packageWrappper = (bsConfig, packageDir, packageFile, md5data, instrumentB
       Object.assign(obj, { packageArchieveCreated: true });
       return resolve(obj);
     }).catch((err) => {
-      obj.error = err.stack.substring(0,100)
+      obj.error = err.stack.substring(0,100);
       return resolve(obj);
     })
   })
 }
 
-exports.packageWrappper = packageWrappper;
+exports.packageWrapper = packageWrapper;

bin/helpers/utils.js

@@ -459,7 +459,8 @@ exports.generateUploadOptions = (type, md5data, packageData) => {
           filename: "tests"
         },
         messages: {
-          uploading: Constants.userMessages.UPLOADING_TESTS
+          uploading: Constants.userMessages.UPLOADING_TESTS,
+          uploadingSuccess: Constants.userMessages.UPLOADING_TESTS_SUCCESS
         },
         cleanupMethod: fileHelpers.deleteZip,
       }
@@ -477,7 +478,8 @@ exports.generateUploadOptions = (type, md5data, packageData) => {
           filename: "bstackPackages"
         },
         messages: {
-          uploading: Constants.userMessages.UPLOADING_NPM_PACKAGES
+          uploading: Constants.userMessages.UPLOADING_NPM_PACKAGES,
+          uploadingSuccess: Constants.userMessages.UPLOADING_NPM_PACKAGES_SUCCESS
         },
         cleanupMethod: fileHelpers.deletePackageArchieve,
       }

bin/helpers/zipUpload.js

@@ -48,7 +48,7 @@ const uploadSuits = (bsConfig, filePath, opts) => {
             }
           }
         } else {
-          logger.info(`Uploaded tests successfully (${responseData[opts.md5ReturnKey]})`);
+          logger.info(`${opts.messages.uploadingSuccess} (${responseData[opts.md5ReturnKey]})`);
           opts.cleanupMethod();
           resolve(responseData);
         }