Merge pull request #283 from marcjansen/test-output

Nicer test output for headless tests

test/phantom-jasmine/console-runner.js

@@ -13,16 +13,16 @@
     throw "jasmine library isn't loaded!";
   }
 
-  var ANSI = {}
+  var ANSI = {};
   ANSI.color_map = {
       "green" : 32,
       "red"   : 31
-  }
+  };
 
   ANSI.colorize_text = function(text, color) {
     var color_code = this.color_map[color];
     return "\033[" + color_code + "m" + text + "\033[0m";
-  }
+  };
 
   var ConsoleReporter = function() {
     if (!console || !console.log) { throw "console isn't present!"; }
@@ -79,24 +79,81 @@
     var resultText = spec.suite.description + " : " + spec.description;
     this.log(resultText, "red");
 
-    var items = spec.results().getItems()
+    var items = spec.results().getItems();
     for (var i = 0; i < items.length; i++) {
       var trace = items[i].trace.stack || items[i].trace;
       this.log(trace, "red");
     }
   };
 
+  /**
+   * Will hold the title of the current 'group'.
+   */
+  proto.lastTitle = "";
+
+  /**
+   * Pads given string up to a target length with a given character on either
+   * the left or right side.
+   */
+  proto.pad = function(string, len, char, side){
+    var str = string + "",
+        whichSide = side || 'left',
+        buff = "",
+        padChar = char || " ",
+        padded = "",
+        iterEnd = len - str.length;
+
+    while(buff.length < iterEnd) {
+      buff += padChar;
+    }
+    if (side === 'left') {
+      padded = buff + str;
+    } else {
+      padded = str + buff;
+    }
+    // we still need a substring when we are called with e.g. " . " as char.
+    return padded.substring(0, len);
+  };
+
+  /**
+   * Pads given string up to a target length with a given character on the right
+   * side.
+   */
+  proto.padRight = function(str, len, char){
+    return this.pad(str, len, char, 'right');
+  };
+
+  /**
+   * Pads given string up to a target length with a given character on the right
+   * side.
+   */
+  proto.padLeft = function(str, len, char){
+    return this.pad(str, len, char, 'left');
+  };
+
   proto.reportSuiteResults = function(suite) {
     if (!suite.parentSuite) { return; }
+    // determine title from full name (wo/ own description)
+    var title = suite.getFullName().replace(new RegExp(suite.description + "$"), "");
+    if (this.lastTitle !== title) {
+      // when title differs, we have a new 'group'
+      this.log("\n" + title);
+    }
+    // always set current title
+    this.lastTitle = title;
+
     var results = suite.results();
     var failed = results.totalCount - results.passedCount;
-    var color = (failed > 0)? "red" : "green";
+    var color = (failed > 0) ? "red" : "green";
-    this.log(suite.description + ": " + results.passedCount + " of " + results.totalCount + " passed.", color);
+    var logStr = " " + this.padRight(suite.description + " ", 60, '.') +
+        this.padLeft(results.passedCount, 4) + "/" +
+        this.padRight(results.totalCount, 4) + " ok";
+    this.log(logStr, color);
   };
 
   proto.log = function(str, color) {
-    var text = (color != undefined)? ANSI.colorize_text(str, color) : str;
+    var text = (color)? ANSI.colorize_text(str, color) : str;
-    console.log(text)
+    console.log(text);
   };
 
   jasmine.ConsoleReporter = ConsoleReporter;