Merge pull request mochajs#167 from TooTallNate/no-carriage-returns

No carriage returns in the built-in reporters (for Windows)
zzen · Dec 20, 2011 · ca54edd · ca54edd
2 parents 221a3c0 + 255d460
commit ca54edd
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/lib/reporters/base.js b/lib/reporters/base.js
@@ -88,6 +88,19 @@ exports.cursor = {
 
   show: function(){
     process.stdout.write('\033[?25h');
+  },
+
+  deleteLine: function(){
+    process.stdout.write('\033[2K');
+  },
+
+  beginningOfLine: function(){
+    process.stdout.write('\033[0G');
+  },
+
+  CR: function(){
+    exports.cursor.deleteLine();
+    exports.cursor.beginningOfLine();
   }
 };
 

diff --git a/lib/reporters/list.js b/lib/reporters/list.js
@@ -4,6 +4,7 @@
  */
 
 var Base = require('./base')
+  , cursor = Base.cursor
   , color = Base.color;
 
 /**
@@ -44,11 +45,13 @@ function List(runner) {
     var fmt = color('checkmark', '  ✓')
       + color('pass', ' %s: ')
       + color(test.speed, '%dms');
-    console.log('\r' + fmt, test.fullTitle(), test.duration);
+    cursor.CR();
+    console.log(fmt, test.fullTitle(), test.duration);
   });
 
   runner.on('fail', function(test, err){
-    console.log('\r' + color('fail', '  %d) %s'), n++, test.fullTitle());
+    cursor.CR();
+    console.log(color('fail', '  %d) %s'), n++, test.fullTitle());
   });
 
   runner.on('end', self.epilogue.bind(self));
@@ -58,4 +61,4 @@ function List(runner) {
  * Inherit from `Base.prototype`.
  */
 
-List.prototype.__proto__ = Base.prototype;
+List.prototype.__proto__ = Base.prototype;
diff --git a/lib/reporters/progress.js b/lib/reporters/progress.js
@@ -58,7 +58,8 @@ function Progress(runner, options) {
       , n = width * percent | 0
       , i = width - n;
 
-    process.stdout.write('\r\033[J');
+    cursor.CR();
+    process.stdout.write('\033[J');
     process.stdout.write(color('progress', '  ' + options.open));
     process.stdout.write(Array(n).join(options.complete));
     process.stdout.write(Array(i).join(options.incomplete));
@@ -81,4 +82,4 @@ function Progress(runner, options) {
  * Inherit from `Base.prototype`.
  */
 
-Progress.prototype.__proto__ = Base.prototype;
+Progress.prototype.__proto__ = Base.prototype;
diff --git a/lib/reporters/spec.js b/lib/reporters/spec.js
@@ -4,6 +4,7 @@
  */
 
 var Base = require('./base')
+  , cursor = Base.cursor
   , color = Base.color;
 
 /**
@@ -59,18 +60,21 @@ function Spec(runner) {
       var fmt = indent()
         + color('checkmark', '  ✓')
         + color('pass', ' %s ');
-      console.log('\r' + fmt, test.title);
+      cursor.CR();
+      console.log(fmt, test.title);
     } else {
       var fmt = indent()
         + color('checkmark', '  ✓')
         + color('pass', ' %s ')
         + color(test.speed, '(%dms)');
-      console.log('\r' + fmt, test.title, test.duration);
+      cursor.CR();
+      console.log(fmt, test.title, test.duration);
     }
   });
 
   runner.on('fail', function(test, err){
-    console.log('\r' + indent() + color('fail', '  %d) %s'), n++, test.title);
+    cursor.CR();
+    console.log(indent() + color('fail', '  %d) %s'), n++, test.title);
   });
 
   runner.on('end', self.epilogue.bind(self));
@@ -80,4 +84,4 @@ function Spec(runner) {
  * Inherit from `Base.prototype`.
  */
 
-Spec.prototype.__proto__ = Base.prototype;
+Spec.prototype.__proto__ = Base.prototype;