🐛 fix for reuploading test zips

Author: Archish27

bin/helpers/archiver.js

@@ -66,15 +66,6 @@ const archiveSpecs = (runSettings, filePath, excludeFiles, md5data) => {
     }
 
     if (typeof runSettings.npm_dependencies === 'object') {
-      if (!("cypress" in runSettings.npm_dependencies)) {
-        logger.warn("Missing cypress not found in npm_dependencies");
-        if ("cypress_version" in runSettings && !runSettings.cypress_version.toString().match(Constants.LATEST_VERSION_SYNTAX_REGEX)) {
-          runSettings.npm_dependencies.cypress = runSettings.cypress_version;
-        } else {
-          runSettings.npm_dependencies.cypress = "latest";
-        }
-        logger.debug(`Adding cypress version ${runSettings.npm_dependencies.cypress} in npm_dependencies`);
-      }  
       Object.assign(packageJSON, {
         devDependencies: runSettings.npm_dependencies,
       });

bin/helpers/checkUploaded.js

@@ -61,15 +61,6 @@ const checkPackageMd5 = (runSettings) => {
   }
 
   if (typeof runSettings.npm_dependencies === 'object') {
-    if (!("cypress" in runSettings.npm_dependencies)) {
-      logger.warn("Missing cypress not found in npm_dependencies");
-      if ("cypress_version" in runSettings && !runSettings.cypress_version.toString().match(Constants.LATEST_VERSION_SYNTAX_REGEX)) {
-        runSettings.npm_dependencies.cypress = runSettings.cypress_version;
-      } else {
-        runSettings.npm_dependencies.cypress = "latest";
-      }
-      logger.warn(`Adding cypress version ${runSettings.npm_dependencies.cypress} in npm_dependencies`);
-    }
     Object.assign(packageJSON, {
       devDependencies: utils.sortJsonKeys(runSettings.npm_dependencies),
     });
@@ -95,6 +86,18 @@ const checkUploadedMd5 = (bsConfig, args, instrumentBlocks) => {
       zipUrlPresent: false,
       packageUrlPresent: false,
     };
+    const runSettings = bsConfig.run_settings;
+    if (typeof runSettings.npm_dependencies === 'object') {
+      if (!("cypress" in runSettings.npm_dependencies)) {
+        logger.warn("Missing cypress not found in npm_dependencies");
+        if ("cypress_version" in runSettings && !runSettings.cypress_version.toString().match(Constants.LATEST_VERSION_SYNTAX_REGEX)) {
+          runSettings.npm_dependencies.cypress = runSettings.cypress_version;
+        } else {
+          runSettings.npm_dependencies.cypress = "latest";
+        }
+        logger.warn(`Adding cypress version ${runSettings.npm_dependencies.cypress} in npm_dependencies`);
+      }
+    }
     if (args["force-upload"]) {
       logger.debug("force-upload set to true. Uploading tests and npm packages.");
       return resolve(obj);

bin/helpers/packageInstaller.js

@@ -29,15 +29,6 @@ const setupPackageFolder = (runSettings, directoryPath) => {
         }
 
         if (typeof runSettings.npm_dependencies === 'object') {
-          if (!("cypress" in runSettings.npm_dependencies)) {
-            logger.warn("Missing cypress not found in npm_dependencies");
-            if ("cypress_version" in runSettings && !runSettings.cypress_version.toString().match(Constants.LATEST_VERSION_SYNTAX_REGEX)) {
-              runSettings.npm_dependencies.cypress = runSettings.cypress_version;
-            } else {
-              runSettings.npm_dependencies.cypress = "latest";
-            }
-            logger.debug(`Adding cypress version ${runSettings.npm_dependencies.cypress} in npm_dependencies`);
-          }
           Object.assign(packageJSON, {
             devDependencies: runSettings.npm_dependencies,
           });

test/unit/bin/helpers/packageInstaller.js

@@ -137,8 +137,7 @@ describe("packageInstaller", () => {
         "name": "test",
         "devDependencies": {
           "random-package-1": "1.2.3",
-          "random-package-2": "1.2.4",
-          "cypress": "latest"
+          "random-package-2": "1.2.4"
         }
       })
       let directoryPath = "/random/path";
@@ -190,8 +189,7 @@ describe("packageInstaller", () => {
         "name": "test",
         "devDependencies": {
           "random-package-1": "1.2.3",
-          "random-package-2": "1.2.4",
-          "cypress": "latest"
+          "random-package-2": "1.2.4"
         }
       })
       let directoryPath = "/random/path";