show filename only if there are multiple paths

Author: dhimil

bin/cli.js

@@ -64,6 +64,14 @@ function cleanUp(signal) {
   }
 }
 
+function getTestBrowserInfo(browserString, path) {
+  var info = browserString;
+  if(config.multipleTest) {
+    info += ", " + path;
+  }
+  return info;
+}
+
 function launchServer() {
   logger.debug("Launching server on port:", serverPort);
 
@@ -74,7 +82,7 @@ function launchServer() {
 function launchBrowser(browser, path) {
   var url = 'http://localhost:' + serverPort.toString() + '/' + path;
   var browserString = utils.browserString(browser);
-  logger.debug("[%s] [%s] Launching", browserString, path);
+  logger.debug("[%s] Launching", getTestBrowserInfo(browserString, path));
 
   var key = utils.uuid();
 
@@ -129,10 +137,12 @@ function launchBrowser(browser, path) {
 function launchBrowsers(config, browser) {
   setTimeout(function () {
     if(Object.prototype.toString.call(config.test_path) === '[object Array]'){
+      config.multipleTest = config.test_path.length > 1? true : false;
       config.test_path.forEach(function(path){
         launchBrowser(browser, path);
       });
     } else {
+      config.multipleTest = false;
       launchBrowser(browser, config.test_path);
     }
   }, 100);
@@ -157,7 +167,7 @@ var statusPoller = {
 
           if (_worker.status === 'running') {
             //clearInterval(statusPoller);
-            logger.debug('[%s] [%s] Launched', worker.string, worker.test_path);
+            logger.debug('[%s] Launched', getTestBrowserInfo(worker.string, worker.test_path));
             worker.launched = true;
             workerData.marked = true;
 

lib/server.js

@@ -20,6 +20,14 @@ var mimeTypes = {
   "css": "text/css"
 };
 
+function getTestBrowserInfo(worker) {
+  var info = worker.string;
+  if(config.multipleTest) {
+    info += ", " + worker.test_path
+  }
+  return info;
+}
+
 
 exports.Server = function Server(bsClient, workers) {
 
@@ -30,7 +38,7 @@ exports.Server = function Server(bsClient, workers) {
     if (query._worker_key && workers[query._worker_key]) {
       worker = workers[query._worker_key] || {};
       worker.acknowledged = true;
-      logger.debug("[%s] [%s] Acknowledged", query._browser_string, worker.test_path);
+      logger.debug("[%s] Acknowledged", getTestBrowserInfo(worker));
     }
 
     fs.exists(filename, function(exists) {
@@ -148,7 +156,7 @@ exports.Server = function Server(bsClient, workers) {
 
       if (query.tracebacks) {
         query.tracebacks.forEach(function(traceback) {
-          logger.info(chalk.red("[%s] [%s] Error:"), worker.string, worker.test_path, formatTraceback(traceback));
+          logger.info(chalk.red("[%s] Error:"), getTestBrowserInfo(worker), formatTraceback(traceback));
         });
       }
       response.end();
@@ -166,28 +174,28 @@ exports.Server = function Server(bsClient, workers) {
         logger.info("[%s] Null response from remote Browser", request.headers['x-browser-string']);
       } else {
         if (query.tracebacks && query.tracebacks.length > 0) {
-          logger.info(chalk["red"]("[%s] [%s] Tracebacks:"), request.headers['x-browser-string'], worker.test_path);
+          logger.info(chalk["red"]("[%s] Tracebacks:"), getTestBrowserInfo(worker));
           query.tracebacks.forEach(function(traceback) {
             logger.info(traceback);
           });
         }
         var color = query.failed ? "red" : "green";
-        logger.info(chalk[color]("[%s] [%s] Completed in %d milliseconds. %d of %d passed, %d failed."), request.headers['x-browser-string'], worker.test_path, query.runtime, query.passed, query.total, query.failed);
+        logger.info(chalk[color]("[%s] Completed in %d milliseconds. %d of %d passed, %d failed."), getTestBrowserInfo(worker), query.runtime, query.passed, query.total, query.failed);
         config.status += query.failed;
       }
 
       if (worker) {
         bsClient.takeScreenshot(worker.id, function(error, screenshot) {
           if (!error && screenshot.url) {
-            logger.info('[%s] [%s] ' + chalk['yellow']('Screenshot') + ': %s', worker.string, worker.test_path, screenshot.url);
+            logger.info('[%s] ' + chalk['yellow']('Screenshot') + ': %s', getTestBrowserInfo(worker), screenshot.url);
           }
 
           bsClient.terminateWorker(worker.id, function() {
             if (!workers[uuid]) {
               return;
             }
 
-            logger.debug('[%s] [%s] Terminated', worker.string, worker.test_path);
+            logger.debug('[%s] Terminated', getTestBrowserInfo(worker));
 
             clearTimeout(workers[uuid].activityTimeout);
             delete workers[uuid];