Browser List Log Format change

Author: karanshah-browserstack

bin/helpers/capabilityHelper.js

@@ -20,17 +20,20 @@ const caps = (bsConfig, zip) => {
 
     // Browser list
     let osBrowserArray = [];
+    let browsersList = [];
     if (bsConfig.browsers) {
       bsConfig.browsers.forEach((element) => {
         osBrowser = element.os + "-" + element.browser;
+        osAndBrowser = element.os + " / " + Utils.capitalizeFirstLetter(element.browser);
         element.versions.forEach((version) => {
           osBrowserArray.push(osBrowser + version);
+          browsersList.push(`${osAndBrowser} (${version})`);
         });
       });
     }
     obj.devices = osBrowserArray;
     if (obj.devices.length == 0) reject(Constants.validationMessages.EMPTY_BROWSER_LIST);
-    logger.info(`Browsers list: ${osBrowserArray.toString()}`);
+    logger.info(`Browsers list: ${browsersList.join(", ")}`);
 
     // Test suite
     if (zip.zip_url && zip.zip_url.split("://")[1].length !== 0) {

bin/helpers/fileHelpers.js

@@ -2,17 +2,17 @@
 const fs = require('fs-extra'),
   path = require('path');
 
-const logger = require("./logger").winstonLogger,
-  Constants = require("../helpers/constants"),
-  config = require("../helpers/config");
+const logger = require('./logger').winstonLogger,
+  Constants = require('../helpers/constants'),
+  config = require('../helpers/config');
 
-exports.write = function(f, message, args, cb) {
+exports.write = function (f, message, args, cb) {
   message = message || 'Creating';
-  fs.writeFile(f.path, f.file, function() {
-    logger.info(message + " file: " + f.path);
-    cb && cb(args)
+  fs.writeFile(f.path, f.file, function () {
+    logger.info(message + ' file: ' + f.path);
+    cb && cb(args);
   });
-}
+};
 
 exports.fileExists = function (filePath, cb) {
   fs.access(filePath, fs.F_OK, (err) => {
@@ -25,21 +25,20 @@ exports.fileExists = function (filePath, cb) {
 };
 
 exports.deleteZip = () => {
-  return fs.unlink(config.fileName, function (err) {
-    if (err) {
-      logger.info(Constants.userMessages.ZIP_DELETE_FAILED);
-      return 1;
-    } else {
-      logger.info(Constants.userMessages.ZIP_DELETED);
-      return 0;
-    }
-  });
-}
+  try {
+    fs.unlinkSync(config.fileName);
+    logger.info(Constants.userMessages.ZIP_DELETED);
+    return 0;
+  } catch (err) {
+    logger.info(Constants.userMessages.ZIP_DELETE_FAILED);
+    return 1;
+  }
+};
 
 exports.dirExists = function (filePath, cb) {
   let exists = false;
   if (fs.existsSync(path.dirname(filePath), cb)) {
     exists = true;
   }
   cb && cb(exists);
-}
+};

bin/helpers/sync/syncSpecsLogs.js

@@ -32,25 +32,25 @@ let  getOptions = (auth, build_id) => {
 let getTableConfig = () => {
   return {
     border: getBorderConfig(),
-    singleLine: true,
     columns: {
-      0: { alignment: 'right' }
+      1: {alignment: 'center', width: 1},
+      2: {alignment: 'left', width: 30}
     },
     columnDefault: {
-      width: 50
+      width: 25,
     },
-    columnCount: 2
+    columnCount: 3,
   };
 }
 
 let getBorderConfig = () => {
   return {
-    topBody: `-`,
+    topBody: ``,
     topJoin: ``,
     topLeft: ``,
     topRight: ``,
 
-    bottomBody: `-`,
+    bottomBody: ``,
     bottomJoin: ``,
     bottomLeft: ``,
     bottomRight: ``,
@@ -81,7 +81,6 @@ let printSpecsStatus = (bsConfig, buildDetails) => {
       },
       function(err, result) { // when loop ends
         specSummary.duration =  endTime - startTime
-        logger.info();
         resolve(specSummary)
       }
     );
@@ -105,6 +104,7 @@ let whileProcess = (whilstCallback) => {
         whileLoop = false;
         endTime = Date.now();
         showSpecsStatus(body);
+        logger.info("\n--------------------------------------------------------------------------------")
         return whilstCallback(null, body);
       default:
         whileLoop = false;
@@ -127,6 +127,7 @@ let showSpecsStatus = (data) => {
 let printInitialLog = () => {
   startTime = Date.now();
   logger.info(`\n${Constants.syncCLI.LOGS.INIT_LOG}`)
+  logger.info("--------------------------------------------------------------------------------")
   n = Constants.syncCLI.INITIAL_DELAY_MULTIPLIER
 }
 
@@ -138,7 +139,7 @@ let printSpecData = (data) => {
 }
 
 let writeToTable = (combination, specName, status) => {
-  stream.write([combination + ":", `${specName} ${status}`]);
+  stream.write([combination , ":", `${specName} ${status}`]);
 }
 
 let addSpecToSummary = (specName, status, combination, session_id) => {
@@ -152,7 +153,7 @@ let addSpecToSummary = (specName, status, combination, session_id) => {
 }
 
 let getCombinationName = (spec) => {
-  return `${spec["os"]} ${spec["osVersion"]} / ${spec["browser"]} ${spec["browserVersion"]}`
+  return `${utils.capitalizeFirstLetter(spec['browser'])} ${spec['browserVersion']} (${spec['os']} ${spec['osVersion']})`;
 }
 
 let getStatus = (status) => {

bin/helpers/utils.js

@@ -314,3 +314,7 @@ exports.setLocalIdentifier = (bsConfig) => {
     );
   }
 };
+
+exports.capitalizeFirstLetter = (stringToCapitalize) => {
+  return stringToCapitalize && (stringToCapitalize[0].toUpperCase() + stringToCapitalize.slice(1));
+};