Dev

commands/utils/batch/batch_runner.js

@@ -15,6 +15,7 @@ const reports = require("../../../commands/generate_reports.js");
 const { fail } = require("yargs");
 const https = require('https');
 const axios = require('axios');
+const converter=require("../../../converter/converter.js");
 
 var batchCounter = 0;
 var totalBatches = 0;
@@ -99,146 +100,149 @@ async function run(lt_config, batches, env) {
   //console.log("Total number of batches " + totalBatches);
   return new Promise(function (resolve, reject) {
     //archive the project i.e the current working directory
-    archive
-      .archive_project(lt_config)
-      .then(function (file_obj) {
-        project_file = file_obj["name"];
-        lt_config["run_settings"]["project_file"] = project_file;
-        //upload the project and get the project link
-        uploader
-          .upload_zip(lt_config, file_obj["name"], "project", env)
-          .then(async function (resp) {
-            // TODO: remove hard check for undefined. handle it using nested promise rejection
-            if (resp == undefined) {
-              console.log(
-                "Either your creds are invalid or something is wrong with the configs provided"
-              );
-              return;
-            }
-            //add project link in lt config
-            project_url = resp["value"]["message"].split("?")[0].split("/");
-            project_url = project_url[project_url.length - 1];
-            lt_config["run_settings"]["project_url"] = project_url;
-            lt_config["test_suite"] = batches[0];
-            archive
-              .archive_batch(lt_config, batches[0], env)
-              .then(async function (file_obj) {
-                uploader
-                  .upload_zip(lt_config, file_obj["name"], "tests", env)
-                  .then(async function (resp) {
-                    var payload = JSON.stringify({
-                      payload: {
-                        test_file: resp["value"]["message"].split("?")[0],
-                      },
-                      username: lt_config["lambdatest_auth"]["username"],
-                      access_key: lt_config["lambdatest_auth"]["access_key"],
-                      type: "cypress"
-                    });
-                    run_test(
-                      payload,
-                      env,
-                      lt_config.run_settings.reject_unauthorized
-                    )
-                      .then(function (session_id) {
-                        if (!lt_config["run_settings"]["retry_failed"]) {
-                          delete_archive(project_file);
-                        }
-                        delete_archive(file_obj["name"]);
-                        //listen to control+c signal and stop tests
-                        process.on("SIGINT", async () => {
-                          try {
-                            console.log(
-                              "Control+c signal received.\nTrying to Terminate the processes"
-                            );
-                            await builds.stop_cypress_session(
-                              lt_config,
-                              session_id,
-                              env
-                            );
-                            resolve(0);
-                          } catch (e) {
-                            console.log("Could not exit process. Try Again!!!");
+    converter(lt_config,"he_conv.yaml").then(function () {
+      console.log("json converted to YAML")
+        archive
+        .archive_project(lt_config)
+        .then(function (file_obj) {
+          project_file = file_obj["name"];
+          lt_config["run_settings"]["project_file"] = project_file;
+          //upload the project and get the project link
+          uploader
+            .upload_zip(lt_config, file_obj["name"], "project", env)
+            .then(async function (resp) {
+              // TODO: remove hard check for undefined. handle it using nested promise rejection
+              if (resp == undefined) {
+                console.log(
+                  "Either your creds are invalid or something is wrong with the configs provided"
+                );
+                return;
+              }
+              //add project link in lt config
+              project_url = resp["value"]["message"].split("?")[0].split("/");
+              project_url = project_url[project_url.length - 1];
+              lt_config["run_settings"]["project_url"] = project_url;
+              lt_config["test_suite"] = batches[0];
+              archive
+                .archive_batch(lt_config, batches[0], env)
+                .then(async function (file_obj) {
+                  uploader
+                    .upload_zip(lt_config, file_obj["name"], "tests", env)
+                    .then(async function (resp) {
+                      var payload = JSON.stringify({
+                        payload: {
+                          test_file: resp["value"]["message"].split("?")[0],
+                        },
+                        username: lt_config["lambdatest_auth"]["username"],
+                        access_key: lt_config["lambdatest_auth"]["access_key"],
+                        type: "cypress"
+                      });
+                      run_test(
+                        payload,
+                        env,
+                        lt_config.run_settings.reject_unauthorized
+                      )
+                        .then(function (session_id) {
+                          if (!lt_config["run_settings"]["retry_failed"]) {
+                            delete_archive(project_file);
                           }
-                        });
-                        if (
-                          lt_config["run_settings"]["sync"] == true ||
-                          (lt_config["tunnel_settings"]["tunnel"] && lt_config["tunnel_settings"]["autostart"]) || (lt_config["run_settings"]["retry_failed"] == true )
-                        ) {
-                          console.log("Waiting for build to finish...");
-                          poller.update_status(true);
-                          poller.poll_build(lt_config, session_id, env)
-                            .then( function (result) {
-                              const { exit_code, build_info } = result;
-                              if (lt_config["run_settings"]["retry_failed"] == true && build_info != null ) {
-                                let failed_test_suites = [];
-                                for (i = 0; i < build_info["data"].length; i++) {
-                                  if (build_info["data"][i]["status_ind"] == "failed") {
-                                    let failed_spec = findSpecFile(lt_config["test_suite"],build_info["data"][i])
-                                    let failed_suite = {
-                                      spec_file: failed_spec,
-                                      path: build_info["data"][i]["path"],
-                                      browser: build_info["data"][i]["browser"],
-                                      version: build_info["data"][i]["version"],
-                                      platform: build_info["data"][i]["platform"]
+                          delete_archive(file_obj["name"]);
+                          //listen to control+c signal and stop tests
+                          process.on("SIGINT", async () => {
+                            try {
+                              console.log(
+                                "Control+c signal received.\nTrying to Terminate the processes"
+                              );
+                              await builds.stop_cypress_session(
+                                lt_config,
+                                session_id,
+                                env
+                              );
+                              resolve(0);
+                            } catch (e) {
+                              console.log("Could not exit process. Try Again!!!");
+                            }
+                          });
+                          if (
+                            lt_config["run_settings"]["sync"] == true ||
+                            (lt_config["tunnel_settings"]["tunnel"] && lt_config["tunnel_settings"]["autostart"]) || (lt_config["run_settings"]["retry_failed"] == true )
+                          ) {
+                            console.log("Waiting for build to finish...");
+                            poller.update_status(true);
+                            poller.poll_build(lt_config, session_id, env)
+                              .then( function (result) {
+                                const { exit_code, build_info } = result;
+                                if (lt_config["run_settings"]["retry_failed"] == true && build_info != null ) {
+                                  let failed_test_suites = [];
+                                  for (i = 0; i < build_info["data"].length; i++) {
+                                    if (build_info["data"][i]["status_ind"] == "failed") {
+                                      let failed_spec = findSpecFile(lt_config["test_suite"],build_info["data"][i])
+                                      let failed_suite = {
+                                        spec_file: failed_spec,
+                                        path: build_info["data"][i]["path"],
+                                        browser: build_info["data"][i]["browser"],
+                                        version: build_info["data"][i]["version"],
+                                        platform: build_info["data"][i]["platform"]
+                                      }
+                                      failed_test_suites.push(failed_suite);
                                     }
-                                    failed_test_suites.push(failed_suite);
                                   }
-                                }
-                                if (failed_test_suites.length > 0) {
-                                  console.log("Retrying failed tests.")
-                                  let batches = [failed_test_suites]
-                                    retry_run(lt_config, batches, env)
-                                    .then(function (exit_code) {
-                                      if (exit_code) {
-                                      console.log("retried failed tests ended with exit code " + exit_code);
-                                      }
-                                      resolve(exit_code);
-                                    })
-                                    .catch(function (error) {
-                                      console.log(error);
-                                      resolve(1);
-                                    });                                 
+                                  if (failed_test_suites.length > 0) {
+                                    console.log("Retrying failed tests.")
+                                    let batches = [failed_test_suites]
+                                      retry_run(lt_config, batches, env)
+                                      .then(function (exit_code) {
+                                        if (exit_code) {
+                                        console.log("retried failed tests ended with exit code " + exit_code);
+                                        }
+                                        resolve(exit_code);
+                                      })
+                                      .catch(function (error) {
+                                        console.log(error);
+                                        resolve(1);
+                                      });                                 
+                                  } else {
+                                    resolve(exit_code);
+                                  }
                                 } else {
                                   resolve(exit_code);
                                 }
-                              } else {
-                                resolve(exit_code);
-                              }
-                            })
-                            .catch(function (err) {
-                              console.log(
-                                "Some error occured in getting build updates",
-                                err.message
-                              );
-                            });
-                        } else {
-                          resolve(0);
-                        }
-                      })
-                      .catch(function (err) {
-                        console.log("Error occured while creating tests", err);
-                      });
-                  })
-                  .catch(function (err) {
-                    delete_archive(file_obj["name"]);
-                    console.log("Error occured while uploading files ", err);
-                  });
-              })
-              .catch(function (err) {
-                console.log("Not able to archive the batch of test files", err);
-              });
-          })
-          .catch(function (err) {
-            console.log(err);
-            archive.delete_archive(project_file);
-            reject(err);
-          });
-      })
-      .catch(function (err) {
-        console.log("Unable to archive the project");
-        console.log(err);
-        reject(err);
-      });
+                              })
+                              .catch(function (err) {
+                                console.log(
+                                  "Some error occured in getting build updates",
+                                  err.message
+                                );
+                              });
+                          } else {
+                            resolve(0);
+                          }
+                        })
+                        .catch(function (err) {
+                          console.log("Error occured while creating tests", err);
+                        });
+                    })
+                    .catch(function (err) {
+                      delete_archive(file_obj["name"]);
+                      console.log("Error occured while uploading files ", err);
+                    });
+                })
+                .catch(function (err) {
+                  console.log("Not able to archive the batch of test files", err);
+                });
+            })
+            .catch(function (err) {
+              console.log(err);
+              archive.delete_archive(project_file);
+              reject(err);
+            });
+        })
+        .catch(function (err) {
+          console.log("Unable to archive the project");
+          console.log(err);
+          reject(err);
+        });
+    });
   });
 }
 

commands/utils/batch/batcher.js

@@ -109,4 +109,5 @@ function make_batches(lt_config) {
 
 module.exports = {
   make_batches: make_batches,
+  get_spec_files:get_spec_files,
 };

commands/utils/set_args.js

@@ -448,6 +448,23 @@ function sync_args_from_cmd(args) {
       lt_config["run_settings"]["geo_location"] = "";
     }
 
+    //Check for timezone
+    if ("timezone" in args) {
+      lt_config["run_settings"]["timezone"] = args["timezone"];
+    } else if (!lt_config["run_settings"]["timezone"]) {
+      lt_config["run_settings"]["timezone"] = "";
+    }
+
+    if ("privateCloud" in args) {
+      if (args["privateCloud"]=="true"){
+        lt_config["run_settings"]["privateCloud"] = true;
+      }else{
+        lt_config["run_settings"]["privateCloud"] = false;
+      }
+    }else if (!lt_config["run_settings"]["privateCloud"]) {
+      lt_config["run_settings"]["privateCloud"] = false ;
+    }
+
     //Check for stop on failure location
     if ("stop_on_failure" in args) {
       lt_config["run_settings"]["stop_on_failure"] = true;

commands/utils/validate.js

@@ -452,6 +452,12 @@ module.exports = validate_config = function (lt_config, validation_configs) {
       }
     }
 
+    if ("privateCloud" in lt_config["run_settings"]) {
+      if (![true, false].includes(lt_config["run_settings"]["privateCloud"])) {
+        reject("Error!! boolean value is expected in privateCloud key");
+      }
+    }
+
     if(lt_config)
     resolve(cypress_version);
   });