added browserstackinfra

Author: dvspvk

bin/commands/runs.js

@@ -50,7 +50,6 @@ module.exports = function run(args, rawArgs) {
     utils.setCypressConfigFilename(bsConfig, args);
 
     const turboScaleSession = false;
-    // Constants.turboScaleObj.enabled = turboScaleSession;
 
     utils.setUsageReportingFlag(bsConfig, args.disableUsageReporting);
 
@@ -62,11 +61,26 @@ module.exports = function run(args, rawArgs) {
     // accept the access key from command line or env variable if provided
     utils.setAccessKey(bsConfig, args);
 
+    const isBrowserstackInfra = true
     let buildReportData = await getInitialDetails(bsConfig, args, rawArgs);
 
     // accept the build name from command line if provided
     utils.setBuildName(bsConfig, args);
 
+    if(isBrowserstackInfra) {
+      // set cypress test suite type
+      utils.setCypressTestSuiteType(bsConfig);
+
+      // set cypress geo location
+      utils.setGeolocation(bsConfig, args);
+
+      // set timezone
+      utils.setTimezone(bsConfig, args);
+
+      // set spec timeout
+      utils.setSpecTimeout(bsConfig, args);
+    }
+
 
     // accept the specs list from command line if provided
     utils.setUserSpecs(bsConfig, args);
@@ -80,8 +94,51 @@ module.exports = function run(args, rawArgs) {
     // accept the system env list from bsconf and set it
     utils.setSystemEnvs(bsConfig);
 
+    if(isBrowserstackInfra) {
+      //accept the local from env variable if provided
+      utils.setLocal(bsConfig, args);
+
+      //set network logs
+      utils.setNetworkLogs(bsConfig);
+
+      // set Local Mode (on-demand/ always-on)
+      utils.setLocalMode(bsConfig, args);
+
+      //accept the local identifier from env variable if provided
+      utils.setLocalIdentifier(bsConfig, args);
+
+      // set Local Config File
+      utils.setLocalConfigFile(bsConfig, args);
+
+      // run test in headed mode
+      utils.setHeaded(bsConfig, args);
+
+      // set the no-wrap
+      utils.setNoWrap(bsConfig, args);
+
+      // add cypress dependency if missing
+      utils.setCypressNpmDependency(bsConfig);
+    }
+
     const { packagesInstalled } = await packageInstaller.packageSetupAndInstaller(bsConfig, config.packageDirName, {markBlockStart, markBlockEnd});
 
+    if(isBrowserstackInfra) {
+      // set node version
+      utils.setNodeVersion(bsConfig, args);
+
+      //set browsers
+      await utils.setBrowsers(bsConfig, args);
+
+      //set config (--config)
+      utils.setConfig(bsConfig, args);
+
+      // set sync/async mode (--async/--sync)
+      utils.setCLIMode(bsConfig, args);
+
+      // set other cypress configs e.g. reporter and reporter-options
+      utils.setOtherConfigs(bsConfig, args);
+    }
+
     markBlockEnd('setConfig');
     logger.debug("Completed setting the configs");
 

bin/helpers/atsHelper.js

@@ -262,6 +262,7 @@ const validate = (bsConfig, args) => {
         if (!Utils.isUndefined(bsConfig.run_settings.integrationFolder) && !Utils.isCypressProjDirValid(bsConfig.run_settings.cypressProjectDir,bsConfig.run_settings.integrationFolder)) reject(Constants.validationMessages.INCORRECT_DIRECTORY_STRUCTURE);
       }
     } catch(error){
+      logger.debug(error)
       reject(Constants.validationMessages.INVALID_CYPRESS_JSON)
     }
 

bin/helpers/capabilityHelper.js

@@ -11,7 +11,6 @@ const config = require('./config'),
 const { AUTH_REGEX, REDACTED_AUTH, REDACTED, CLI_ARGS_REGEX, RAW_ARGS_REGEX } = require("./constants");
 const { default: axios } = require("axios");
 const axiosRetry = require("axios-retry");
-const { isTurboScaleSession } = require('../helpers/atsHelper');
 
 function get_version(package_name) {
   try {
@@ -199,56 +198,9 @@ function redactKeys(str, regex, redact) {
   return str.replace(regex, redact);
 }
 
-function sendTurboscaleErrorLogs(args) {
-  let bsConfig = JSON.parse(JSON.stringify(args.bstack_config));
-  let data = utils.isUndefined(args.data) ? {} : args.data;
-  const turboscaleErrorPayload = {
-    kind: 'hst-cypress-cli-error',
-    data: data,
-    error: args.message
-  }
-
-  const options = {
-    headers: {
-      'User-Agent': utils.getUserAgent()
-    },
-    method: "POST",
-    auth: {
-      username: bsConfig.auth.username,
-      password: bsConfig.auth.access_key,
-    },
-    url: `${config.turboScaleAPIUrl}/send-instrumentation`,
-    body: turboscaleErrorPayload,
-    json: true,
-    maxAttempts: 10, // (default) try 3 times
-    retryDelay: 2000, // (default) wait for 2s before trying again
-    retrySrategy: request.RetryStrategies.HTTPOrNetworkError, // (default) retry on 5xx or network errors
-  };
-
-  fileLogger.info(`Sending ${JSON.stringify(turboscaleErrorPayload)} to ${config.turboScaleAPIUrl}/send-instrumentation`);
-  request(options, function (error, res, body) {
-    if (error) {
-      //write err response to file
-      fileLogger.error(JSON.stringify(error));
-      return;
-    }
-    // write response file
-    let response = {
-      attempts: res.attempts,
-      statusCode: res.statusCode,
-      body: body
-    };
-    fileLogger.info(`${JSON.stringify(response)}`);
-  });
-}
-
 async function send(args) {
   let bsConfig = JSON.parse(JSON.stringify(args.bstack_config));
 
-  if (isTurboScaleSession(bsConfig) && args.message_type === 'error') {
-    sendTurboscaleErrorLogs(args);
-  }
-
   if (isUsageReportingEnabled() === "true") return;
 
   let runSettings = "";
@@ -308,10 +260,6 @@ async function send(args) {
     },
   };
 
-  if (isTurboScaleSession(bsConfig)) {
-    payload.event_type = 'hst_cypress_cli_stats';
-  }
-
   const options = {
     headers: {
       "Content-Type": "text/json",