Merge branch 'dev' into MLE-7910

Author: japneetlambdatest

commands/utils/archive.js

@@ -3,6 +3,7 @@ const fs = require("fs");
 const archiver = require("archiver");
 const constants = require("./constants.js");
 const process = require("process");
+const semver = require("semver");
 
 function delete_archive(file_name) {
   try {
@@ -55,6 +56,8 @@ function archive_project(lt_config) {
       "cypress/videos/**/*",
       "cypress/results/**/*",
       "lambdatest-artefacts/**/*",
+      "*.lock",
+      "package-lock.json",
     ].concat(lt_config["run_settings"]["ignore_files"]);
     //If we have some env variables passed through cli or config file we will ignore the original file and create a new one using
     //the parameter appended in config file through code
@@ -72,24 +75,64 @@ function archive_project(lt_config) {
       { cwd: process.cwd(), ignore: ignore_files, dot: false },
       { prefix: "project/" }
     );
+    let raw_package_data = fs.readFileSync("package.json");
+    let package = JSON.parse(raw_package_data);
     //OverRide NPM Dependencies
-    if (lt_config.run_settings.npm_dependencies) {
+    if (
+      lt_config.run_settings.npm_dependencies &&
+      !lt_config.run_settings.cypress_version
+    ) {
       console.log("Overriding NPM Dependencies");
-      let rawdata = fs.readFileSync("package.json");
-
-      let package = JSON.parse(rawdata);
       package.dependencies = lt_config.run_settings.npm_dependencies;
       package.devDependencies = {};
-      archive.append(
-        JSON.stringify(package, null, 4),
-        {
-          name: "project/package.json",
-          cwd: process.cwd(),
-          ignore: ignore_files,
-        },
-        { prefix: "project/" }
-      );
+      package.dependencies.cypress = semver.coerce(
+        package.dependencies.cypress
+      ).version;
+    } else if (
+      lt_config.run_settings.npm_dependencies &&
+      lt_config.run_settings.cypress_version
+    ) {
+      console.log("Overriding NPM Dependencies");
+      package.dependencies = lt_config.run_settings.npm_dependencies;
+      package.devDependencies = {};
+      console.log("Overriding Cypress Version");
+      package.dependencies.cypress = semver.coerce(
+        lt_config.run_settings.cypress_version
+      ).version;
+    } else if (
+      !lt_config.run_settings.npm_dependencies &&
+      lt_config.run_settings.cypress_version
+    ) {
+      console.log("Overriding Cypress Version");
+      if (package.dependencies.hasOwnProperty("cypress")) {
+        package.dependencies.cypress = semver.coerce(
+          lt_config.run_settings.cypress_version
+        ).version;
+      } else {
+        package.devDependencies.cypress = semver.coerce(
+          lt_config.run_settings.cypress_version
+        ).version;
+      }
+    } else {
+      if (package.dependencies.hasOwnProperty("cypress")) {
+        package.dependencies.cypress = semver.coerce(
+          package.dependencies.cypress
+        ).version;
+      } else {
+        package.devDependencies.cypress = semver.coerce(
+          package.devDependencies.cypress
+        ).version;
+      }
     }
+    archive.append(
+      JSON.stringify(package, null, 4),
+      {
+        name: "project/package.json",
+        cwd: process.cwd(),
+        ignore: ignore_files,
+      },
+      { prefix: "project/" }
+    );
     if (fs.existsSync(".npmrc")) {
       let raw_data = fs.readFileSync(".npmrc", "utf8");
       if (

commands/utils/validate.js

@@ -106,6 +106,20 @@ module.exports = validate_config = function (lt_config, validation_configs) {
             }
           }
         }
+        if (
+          lt_config.run_settings.hasOwnProperty("cypress_version") &&
+          lt_config.run_settings.cypress_version != ""
+        ) {
+          cypress_flag = true;
+        } else if (
+          lt_config.run_settings.hasOwnProperty("cypress_version") &&
+          lt_config.run_settings.cypress_version == ""
+        ) {
+          cypress_flag = false;
+          reject(
+            "Error!! cypress_version can not be blank, either provide a value or remove the key"
+          );
+        }
         if (cypress_flag == false && lt_config.run_settings.npm_dependencies) {
           reject(
             "Error!!Cypress dependency is not present in npm_dependencies"
@@ -181,6 +195,15 @@ module.exports = validate_config = function (lt_config, validation_configs) {
         );
       }
     }
+
+    if ("smart_ui" in lt_config.run_settings) {
+      if (!("project" in lt_config.run_settings.smart_ui)) {
+        reject("Smart UI project name is missing");
+      } else if (lt_config.run_settings.smart_ui.project == "") {
+        reject("Smart UI porject name can not be blank");
+
+      }
+    }
     resolve("Validated the Config");
   });
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lambdatest-cypress-cli",
-  "version": "2.1.9",
+  "version": "2.2.0",
   "description": "The lambdatest-cypress-cli is LambdaTest's command-line interface (CLI) aimed to help you run your Cypress tests on LambdaTest platform.",
   "homepage": "https://github.com/LambdaTest/lambdatest-cypress-cli",
   "author": "LambdaTest <[email protected]>",
@@ -22,6 +22,7 @@
     "glob": "^7.1.6",
     "node-stream-zip": "^1.15.0",
     "request": "^2.88.2",
+    "semver": "^7.3.5",
     "ws": "^7.4.3",
     "yargs": "^16.1.0"
   },