From a445a62e7ca295bc38a4fb6f2dee8f8f35534daf Mon Sep 17 00:00:00 2001
From: "Davis W. Frank" <dwfrank@infe.ws>
Date: Mon, 16 May 2011 18:28:46 -0700
Subject: [PATCH] TrivialConsoleReporter now reports the correct number of
 specs that were executed. TCR is still very heavily mocked instead of using
 testing an actual Jasmine environment. But now at least the numbers are
 correct.

---
 spec/node_suite.js                        |  85 ++++-----
 spec/suites/TrivialConsoleReporterSpec.js |  84 ++++++---
 src/console/TrivialConsoleReporter.js     | 211 +++++++++++++---------
 3 files changed, 229 insertions(+), 151 deletions(-)

diff --git a/spec/node_suite.js b/spec/node_suite.js
index 9d7f7bc..1e61804 100644
--- a/spec/node_suite.js
+++ b/spec/node_suite.js
@@ -6,24 +6,26 @@ var path = require('path');
 // undefined = "diz be undefined yo";
 
 var jasmineGlobals = require("../src/base");
-for(var k in jasmineGlobals) {global[k] = jasmineGlobals[k];}
+for (var k in jasmineGlobals) {
+  global[k] = jasmineGlobals[k];
+}
 
 //load jasmine src files based on the order in runner.html
 var srcFilesInProperRequireOrder = [];
 var runnerHtmlLines = fs.readFileSync("spec/runner.html", "utf8").split("\n");
 var srcFileLines = [];
-for (var i=0; i<runnerHtmlLines.length; i++) 
-  if (runnerHtmlLines[i].match(/script(.*?)\/src\//)) 
+for (var i = 0; i < runnerHtmlLines.length; i++)
+  if (runnerHtmlLines[i].match(/script(.*?)\/src\//))
     srcFileLines.push(runnerHtmlLines[i]);
-for (i=0; i<srcFileLines.length; i++) srcFilesInProperRequireOrder.push(srcFileLines[i].match(/src=\"(.*?)\"/)[1]);
-for (i=0; i<srcFilesInProperRequireOrder.length; i++) require(srcFilesInProperRequireOrder[i]);
+for (i = 0; i < srcFileLines.length; i++) srcFilesInProperRequireOrder.push(srcFileLines[i].match(/src=\"(.*?)\"/)[1]);
+for (i = 0; i < srcFilesInProperRequireOrder.length; i++) require(srcFilesInProperRequireOrder[i]);
 
 
 /*
-Pulling in code from jasmine-node.
+ Pulling in code from jasmine-node.
 
-We can't just depend on jasmine-node because it has its own jasmine that it uses.
-*/
+ We can't just depend on jasmine-node because it has its own jasmine that it uses.
+ */
 
 global.window = {
   setTimeout: setTimeout,
@@ -34,61 +36,54 @@ global.window = {
 
 delete global.window;
 
-function noop(){}
+function noop() {
+}
 
-jasmine.executeSpecs = function(specs, done){
-  for (var i = 0, len = specs.length; i < len; ++i){
+jasmine.executeSpecs = function(specs, done) {
+  for (var i = 0, len = specs.length; i < len; ++i) {
     var filename = specs[i];
     require(filename.replace(/\.\w+$/, ""));
   }
 
   var jasmineEnv = jasmine.getEnv();
-  jasmineEnv.reporter = new jasmine.TrivialConsoleReporter(sys.print, done);
+  var consoleReporter = new jasmine.TrivialConsoleReporter(sys.print, done);
+
+  jasmineEnv.addReporter(consoleReporter);
   jasmineEnv.execute();
 };
 
-jasmine.getAllSpecFiles = function(dir, matcher){
+jasmine.getAllSpecFiles = function(dir, matcher) {
   var specs = [];
 
   if (fs.statSync(dir).isFile() && dir.match(matcher)) {
     specs.push(dir);
   } else {
     var files = fs.readdirSync(dir);
-    for (var i = 0, len = files.length; i < len; ++i){
+    for (var i = 0, len = files.length; i < len; ++i) {
       var filename = dir + '/' + files[i];
-      if (fs.statSync(filename).isFile() && filename.match(matcher)){
+      if (fs.statSync(filename).isFile() && filename.match(matcher)) {
         specs.push(filename);
-      }else if (fs.statSync(filename).isDirectory()){
+      } else if (fs.statSync(filename).isDirectory()) {
         var subfiles = this.getAllSpecFiles(filename, matcher);
-        subfiles.forEach(function(result){
+        subfiles.forEach(function(result) {
           specs.push(result);
         });
       }
     }
   }
-  
+
   return specs;
 };
 
-jasmine.printRunnerResults = function(runner){
-  var results = runner.results();
-  var suites = runner.suites();
-  var msg = '';
-  msg += suites.length + ' spec' + ((suites.length === 1) ? '' : 's') + ', ';
-  msg += results.totalCount + ' expectation' + ((results.totalCount === 1) ? '' : 's') + ', ';
-  msg += results.failedCount + ' failure' + ((results.failedCount === 1) ? '' : 's') + '\n';
-  return msg;
-};
-
-function now(){
+function now() {
   return new Date().getTime();
 }
 
-jasmine.asyncSpecWait = function(){
+jasmine.asyncSpecWait = function() {
   var wait = jasmine.asyncSpecWait;
   wait.start = now();
   wait.done = false;
-  (function innerWait(){
+  (function innerWait() {
     waits(10);
     runs(function() {
       if (wait.start + wait.timeout < now()) {
@@ -102,41 +97,37 @@ jasmine.asyncSpecWait = function(){
   })();
 };
 jasmine.asyncSpecWait.timeout = 4 * 1000;
-jasmine.asyncSpecDone = function(){
+jasmine.asyncSpecDone = function() {
   jasmine.asyncSpecWait.done = true;
 };
 
-for ( var key in jasmine) {
+for (var key in jasmine) {
   exports[key] = jasmine[key];
 }
 
 /*
-End jasmine-node runner
-*/
-
-
-
-
+ End jasmine-node runner
+ */
 
 var isVerbose = false;
 var showColors = true;
-process.argv.forEach(function(arg){
-  switch(arg) {
-  case '--color': showColors = true; break;
-  case '--noColor': showColors = false; break;
-  case '--verbose': isVerbose = true; break;
+process.argv.forEach(function(arg) {
+  switch (arg) {
+    case '--color': showColors = true; break;
+    case '--noColor': showColors = false; break;
+    case '--verbose': isVerbose = true; break;
   }
 });
 
 var specs = jasmine.getAllSpecFiles(__dirname + '/suites', new RegExp(".js$"));
 var domIndependentSpecs = [];
-for(var i=0; i<specs.length; i++) { 
-  if (fs.readFileSync(specs[i], "utf8").indexOf("document.createElement")<0) {
+for (var i = 0; i < specs.length; i++) {
+  if (fs.readFileSync(specs[i], "utf8").indexOf("document.createElement") < 0) {
     domIndependentSpecs.push(specs[i]);
   }
 }
 
-jasmine.executeSpecs(domIndependentSpecs, function(runner, log){
+jasmine.executeSpecs(domIndependentSpecs, function(runner, log) {
   if (runner.results().failedCount === 0) {
     process.exit(0);
   } else {
diff --git a/spec/suites/TrivialConsoleReporterSpec.js b/spec/suites/TrivialConsoleReporterSpec.js
index 80a77bb..71a7741 100644
--- a/spec/suites/TrivialConsoleReporterSpec.js
+++ b/spec/suites/TrivialConsoleReporterSpec.js
@@ -31,20 +31,37 @@ describe("TrivialConsoleReporter", function() {
       };
     }
   },
-    failingSpec = { results: function() {
-      return {passed: function() {
-        return false;
-      }};
-    } },
-    skippedSpec = { results: function() {
-      return {skipped: true};
-    } },
-    passingRun = { results: function() {
-      return {failedCount: 0, items_: [null, null, null]};
-    } },
-    failingRun = { results: function() {
-      return {failedCount: 7, items_: [null, null, null]};
-    } };
+    failingSpec = {
+      results: function() {
+        return {
+          passed: function() {
+            return false;
+          }
+        };
+      }
+    },
+    skippedSpec = {
+      results: function() {
+        return {skipped: true};
+      }
+    },
+    passingRun = {
+      specs: function() {
+        return [null, null, null];
+      },
+      results: function() {
+        return {failedCount: 0, items_: [null, null, null]};
+      }
+    },
+    failingRun = {
+      specs: function() {
+        return [null, null, null];
+      },
+      results: function() {
+        return {
+          failedCount: 7, items_: [null, null, null]};
+      }
+    };
 
   function repeatedlyInvoke(f, times) {
     for (var i = 0; i < times; i++) f(times + 1);
@@ -101,18 +118,21 @@ describe("TrivialConsoleReporter", function() {
       simulateRun(reporter,
         repeat(passingSpec, 3),
         [],
-        {
-          results:function() {
-            return {
-              items_: [null, null, null],
-              totalCount: 7,
-              failedCount: 0
-            };
-          }
+      {
+        specs: function() {
+          return [null, null, null];
         },
+        results:function() {
+          return {
+            items_: [null, null, null],
+            totalCount: 7,
+            failedCount: 0
+          };
+        }
+      },
         1000,
         1777
-      );
+        );
 
       expect(out.getOutput()).toEqual(
         [
@@ -131,6 +151,9 @@ describe("TrivialConsoleReporter", function() {
         repeat(passingSpec, 57),
         [],
       {
+        specs: function() {
+          return [null, null, null];
+        },
         results:function() {
           return {
             items_: [null, null, null],
@@ -200,6 +223,9 @@ describe("TrivialConsoleReporter", function() {
             }}
         ],
       {
+        specs: function() {
+          return [null, null, null];
+        },
         results:function() {
           return {
             items_: [null, null, null],
@@ -407,6 +433,9 @@ describe("TrivialConsoleReporter", function() {
       describe("when reporting the results summary", function() {
         it("prints statistics in green if there were no failures", function() {
           reporter.reportRunnerResults({
+            specs: function() {
+              return [null, null, null];
+            },
             results:function() {
               return {items_: [null, null, null], totalCount: 7, failedCount: 0};
             }
@@ -417,6 +446,9 @@ describe("TrivialConsoleReporter", function() {
 
         it("prints statistics in red if there was a failure", function() {
           reporter.reportRunnerResults({
+            specs: function() {
+              return [null, null, null];
+            },
             results:function() {
               return {items_: [null, null, null], totalCount: 7, failedCount: 3};
             }
@@ -427,6 +459,9 @@ describe("TrivialConsoleReporter", function() {
 
         it("handles pluralization with 1's ones appropriately", function() {
           reporter.reportRunnerResults({
+            specs: function() {
+              return [null];
+            },
             results:function() {
               return {items_: [null], totalCount: 1, failedCount: 1};
             }
@@ -440,6 +475,9 @@ describe("TrivialConsoleReporter", function() {
         it("calls back when done", function() {
           expect(done).toBeFalsy();
           reporter.reportRunnerResults({
+            specs: function() {
+              return [null, null, null];
+            },
             results:function() {
               return {items_: [null, null, null], totalCount: 7, failedCount: 0};
             }
diff --git a/src/console/TrivialConsoleReporter.js b/src/console/TrivialConsoleReporter.js
index 0bdce28..dc19930 100644
--- a/src/console/TrivialConsoleReporter.js
+++ b/src/console/TrivialConsoleReporter.js
@@ -1,65 +1,111 @@
 jasmine.TrivialConsoleReporter = function(print, doneCallback) {
   //inspired by mhevery's jasmine-node reporter
   //https://github.com/mhevery/jasmine-node
-  
-  doneCallback = doneCallback || function(){};
-  
-  var defaultColumnsPerLine = 50,
-      ansi = { green: '\033[32m', red: '\033[31m', yellow: '\033[33m', none: '\033[0m' },
-      language = { spec:"spec", expectation:"expectation", failure:"failure" };
-  
-  function coloredStr(color, str) { return ansi[color] + str + ansi.none; }
-  
-  function greenStr(str)  { return coloredStr("green", str); }
-  function redStr(str)    { return coloredStr("red", str); }
-  function yellowStr(str) { return coloredStr("yellow", str); }
-  
-  function newline()         { print("\n"); }
-  function started()         { print("Started"); 
-                               newline(); }
 
-  function greenDot()        { print(greenStr(".")); }
-  function redF()            { print(redStr("F")); }
-  function yellowStar()      { print(yellowStr("*")); }
-  
-  function plural(str, count) { return count == 1 ? str : str + "s"; }
-  
-  function repeat(thing, times) { var arr = [];
-                                  for(var i=0; i<times; i++) arr.push(thing);
-                                  return arr;
-                                }
-  
-  function indent(str, spaces) { var lines = (str || '').split("\n");
-                                 var newArr = [];
-                                 for(var i = 0; i < lines.length; i++) {
-                                   newArr.push(repeat(" ", spaces).join("") + lines[i]);
-                                 }
-                                 return newArr.join("\n");
-                               }
-  
-  function specFailureDetails(suiteDescription, specDescription, stackTraces)  { 
-                               newline(); 
-                               print(suiteDescription + " " + specDescription); 
-                               newline();
-                               for(var i=0; i<stackTraces.length; i++) {
-                                 print(indent(stackTraces[i], 2));
-                                 newline();
-                               }
-                             }
-  function finished(elapsed)  { newline(); 
-                                print("Finished in " + elapsed/1000 + " seconds"); }
-  function summary(colorF, specs, expectations, failed)  { newline();
-                                                         print(colorF(specs + " " + plural(language.spec, specs) + ", " +
-                                                                      expectations + " " + plural(language.expectation, expectations) + ", " +
-                                                                      failed + " " + plural(language.failure, failed))); 
-                                                         newline();
-                                                         newline(); }
-  function greenSummary(specs, expectations, failed){ summary(greenStr, specs, expectations, failed); }
-  function redSummary(specs, expectations, failed){ summary(redStr, specs, expectations, failed); }
-  
-  
-  
-  
+  doneCallback = doneCallback || function() {
+  };
+
+  var defaultColumnsPerLine = 50,
+    ansi = {
+      green: '\033[32m',
+      red: '\033[31m',
+      yellow: '\033[33m',
+      none: '\033[0m'
+    },
+    language = {
+      spec: "spec",
+      expectation: "expectation",
+      failure: "failure"
+    };
+
+  function coloredStr(color, str) {
+    return ansi[color] + str + ansi.none;
+  }
+
+  function greenStr(str) {
+    return coloredStr("green", str);
+  }
+
+  function redStr(str) {
+    return coloredStr("red", str);
+  }
+
+  function yellowStr(str) {
+    return coloredStr("yellow", str);
+  }
+
+  function newline() {
+    print("\n");
+  }
+
+  function started() {
+    print("Started");
+    newline();
+  }
+
+  function greenDot() {
+    print(greenStr("."));
+  }
+
+  function redF() {
+    print(redStr("F"));
+  }
+
+  function yellowStar() {
+    print(yellowStr("*"));
+  }
+
+  function plural(str, count) {
+    return count == 1 ? str : str + "s";
+  }
+
+  function repeat(thing, times) {
+    var arr = [];
+    for (var i = 0; i < times; i++) arr.push(thing);
+    return arr;
+  }
+
+  function indent(str, spaces) {
+    var lines = (str || '').split("\n");
+    var newArr = [];
+    for (var i = 0; i < lines.length; i++) {
+      newArr.push(repeat(" ", spaces).join("") + lines[i]);
+    }
+    return newArr.join("\n");
+  }
+
+  function specFailureDetails(suiteDescription, specDescription, stackTraces) {
+    newline();
+    print(suiteDescription + " " + specDescription);
+    newline();
+    for (var i = 0; i < stackTraces.length; i++) {
+      print(indent(stackTraces[i], 2));
+      newline();
+    }
+  }
+
+  function finished(elapsed) {
+    newline();
+    print("Finished in " + elapsed / 1000 + " seconds");
+  }
+
+  function summary(colorF, specs, expectations, failed) {
+    newline();
+    print(colorF(specs + " " + plural(language.spec, specs) + ", " +
+      expectations + " " + plural(language.expectation, expectations) + ", " +
+      failed + " " + plural(language.failure, failed)));
+    newline();
+    newline();
+  }
+
+  function greenSummary(specs, expectations, failed) {
+    summary(greenStr, specs, expectations, failed);
+  }
+
+  function redSummary(specs, expectations, failed) {
+    summary(redStr, specs, expectations, failed);
+  }
+
   function lineEnder(columnsPerLine) {
     var columnsSoFar = 0;
     return function() {
@@ -73,21 +119,24 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
 
   function fullSuiteDescription(suite) {
     var fullDescription = suite.description;
-    if (suite.parentSuite) fullDescription = fullSuiteDescription(suite.parentSuite) + " " + fullDescription ;
+    if (suite.parentSuite) fullDescription = fullSuiteDescription(suite.parentSuite) + " " + fullDescription;
     return fullDescription;
   }
-  
+
   var startNewLineIfNecessary = lineEnder(defaultColumnsPerLine);
-  
-  this.now = function() { return new Date().getTime(); };
-  
+
+  this.now = function() {
+    return new Date().getTime();
+  };
+
   this.reportRunnerStarting = function() {
     this.runnerStartTime = this.now();
     started();
   };
-  
-  this.reportSpecStarting = function() { /* do nothing */ };
-  
+
+  this.reportSpecStarting = function() { /* do nothing */
+  };
+
   this.reportSpecResults = function(spec) {
     var results = spec.results();
     if (results.skipped) {
@@ -96,49 +145,49 @@ jasmine.TrivialConsoleReporter = function(print, doneCallback) {
       greenDot();
     } else {
       redF();
-    } 
+    }
 //    startNewLineIfNecessary();
   };
-  
+
   this.suiteResults = [];
-  
+
   this.reportSuiteResults = function(suite) {
     var suiteResult = {
       description: fullSuiteDescription(suite),
       failedSpecResults: []
     };
-    
-    suite.results().items_.forEach(function(spec){
+
+    suite.results().items_.forEach(function(spec) {
       if (spec.failedCount > 0 && spec.description) suiteResult.failedSpecResults.push(spec);
     });
-    
+
     this.suiteResults.push(suiteResult);
   };
-  
+
   function eachSpecFailure(suiteResults, callback) {
-    for(var i=0; i<suiteResults.length; i++) {
+    for (var i = 0; i < suiteResults.length; i++) {
       var suiteResult = suiteResults[i];
-      for(var j=0; j<suiteResult.failedSpecResults.length; j++) {
+      for (var j = 0; j < suiteResult.failedSpecResults.length; j++) {
         var failedSpecResult = suiteResult.failedSpecResults[j];
         var stackTraces = [];
-        for(var k=0; k<failedSpecResult.items_.length; k++) stackTraces.push(failedSpecResult.items_[k].trace.stack);
+        for (var k = 0; k < failedSpecResult.items_.length; k++) stackTraces.push(failedSpecResult.items_[k].trace.stack);
         callback(suiteResult.description, failedSpecResult.description, stackTraces);
       }
     }
   }
-  
+
   this.reportRunnerResults = function(runner) {
     newline();
-    
+
     eachSpecFailure(this.suiteResults, function(suiteDescription, specDescription, stackTraces) {
       specFailureDetails(suiteDescription, specDescription, stackTraces);
     });
-    
+
     finished(this.now() - this.runnerStartTime);
-    
+
     var results = runner.results();
     var summaryFunction = results.failedCount === 0 ? greenSummary : redSummary;
-    summaryFunction(results.items_.length, results.totalCount, results.failedCount);
+    summaryFunction(runner.specs().length, results.totalCount, results.failedCount);
     doneCallback(runner);
   };
 };
\ No newline at end of file