Merge pull request #447 from LambdaTest/dev

StageToProd

Author: abhishek-lambda

.gitignore

@@ -40,6 +40,7 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+package-lock.json
 
 # TypeScript v1 declaration files
 typings/

accessibility/scanner/index.js

@@ -165,14 +165,16 @@ const processAccessibilityReport = async (windowNew) => {
         let needsReviewValue = Cypress.env("NEEDS_REVIEW") !== "false"; // Default to true
         let captureScreenshot = Cypress.env("CAPTURE_SCREENSHOT") === "true";
         let passedTestCases = Cypress.env("PASSED_TEST_CASES") === "true";
+        let testId = Cypress.env("TEST_ID") || ""
 
         const payloadToSend = {
             message: 'SET_CONFIG',
             wcagCriteria: wcagCriteriaValue,
             bestPractice: bestPracticeValue,
             needsReview: needsReviewValue,
             captureScreenshot: captureScreenshot,
-            passedTestCases: passedTestCases
+            passedTestCases: passedTestCases,
+            testId: testId
         };
 
         console.log('log', "SET SCAN: Payload to send: ", payloadToSend);
@@ -186,7 +188,7 @@ const processAccessibilityReport = async (windowNew) => {
 
         let scanData;
         try {
-            const payload = {message: 'GET_LATEST_SCAN_DATA'};
+            const payload = {message: 'GET_LATEST_SCAN_DATA', testId: testId};
             scanData = await getScanData(windowNew, payload);
             LambdatestLog("GET SCAN:LambdaTest Accessibility: Scanning URL");
             if (captureScreenshot) {
@@ -248,17 +250,18 @@ function oldprocessAccessibilityReport(win){
     let wcagCriteriaValue = Cypress.env("WCAG_CRITERIA") || "wcag21a";
     let bestPracticeValue = Cypress.env("BEST_PRACTICE") || false;
     let needsReviewValue = Cypress.env("NEEDS_REVIEW") || true;
+    let testId = Cypress.env("TEST_ID") || ""
     bestPracticeValue =  bestPracticeValue == "true" ? true : false;
     needsReviewValue = needsReviewValue == "true" ? true : false;
     const payloadToSend = {
         message: 'SET_CONFIG',
         wcagCriteria: wcagCriteriaValue,
         bestPractice: bestPracticeValue,
-        needsReview: needsReviewValue
+        needsReview: needsReviewValue,
+        testId: testId
     }
 
     console.log('log', "payload to send " + payloadToSend);
-    let testId = Cypress.env("TEST_ID") || ""
 
     const filePath = Cypress.env("ACCESSIBILITY_REPORT_PATH") || 'cypress/results/accessibilityReport_' + testId + '.json';
 
@@ -267,6 +270,7 @@ function oldprocessAccessibilityReport(win){
 
         const payload = {
             message: 'GET_LATEST_SCAN_DATA',
+            testId: testId
         }
 
         cy.wrap(getScanData(win, payload), {timeout: 45000}).then((res) => {

commands/utils/set_args.js

@@ -461,6 +461,13 @@ function sync_args_from_cmd(args) {
       lt_config["run_settings"]["timezone"] = "";
     }
 
+    //Check for region
+    if ("region" in args) {
+      lt_config["run_settings"]["region"] = args["region"];
+    } else if (!lt_config["run_settings"]["region"]) {
+      lt_config["run_settings"]["region"] = "";
+    }
+
     if ("privateCloud" in args) {
       if (args["privateCloud"]=="true"){
         lt_config["run_settings"]["privateCloud"] = true;

commands/utils/validate.js

@@ -205,6 +205,17 @@ module.exports = validate_config = function (lt_config, validation_configs) {
       }
     }
 
+    //validate if region field contains expected value
+    if ("region" in lt_config["run_settings"]) {
+      if (
+        !(
+          typeof lt_config["run_settings"]["region"] === "string"
+        )
+      ) {
+        reject("Error!! string value is expected in region key");
+      }
+    }
+
     //validate if accessibility field contains expected value
     if ("accessibility" in lt_config["run_settings"]) {
       if (![true, false].includes(lt_config["run_settings"]["accessibility"])) {

index.js

@@ -261,6 +261,11 @@ const argv = require("yargs")
           describe: "Set custom timezone in machine for cypress.",
           type: "string",
         })
+        .option("reg",{
+          alias: "region",
+          describe: "Set data center region (e.g., us, eu, ap)",
+          type: "string",
+        })
         .option("pC",{
           alias: "privateCloud",
           describe: "Set custom private Cloud",