[fix] Partially revert bc4c239. Fixes #325.

vowsjs · Nov 21, 2014 · acbb20a · acbb20a
1 parent 2405195
commit acbb20a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/lib/vows.js b/lib/vows.js
@@ -17,6 +17,7 @@
 //
 var path = require('path'),
     events = require('events'),
+    util = require('util'),
     vows = exports;
 
 // Options
@@ -122,7 +123,7 @@ function addVow(vow) {
             var after = vow.binding.context.after;
             // only need to check order.  I won't get here if the after event
             // has never been emitted
-            if (self._vowsEmitedEventsOrder.indexOf(after) > 
+            if (self._vowsEmitedEventsOrder.indexOf(after) >
                 self._vowsEmitedEventsOrder.indexOf(event)) {
                 output('broken', event + ' emitted before ' + after);
                 return;
@@ -184,7 +185,7 @@ process.on('exit', function () {
                 }
             });
 
-            if (unFired.length > 0) { console.log(); }
+            if (unFired.length > 0) { util.print('\n'); }
 
             unFired.forEach(function (title) {
                 s.reporter.report(['error', {
@@ -204,7 +205,7 @@ process.on('exit', function () {
         });
     });
     if (failure) {
-        console.log(console.result(results));
+        util.puts(console.result(results));
         process.exit(1);
     }
 });

diff --git a/lib/vows/console.js b/lib/vows/console.js
@@ -5,7 +5,7 @@ this.stylize = function stylize(str, style) {
     if (module.exports.nocolor) {
       return str;
     }
-    
+
     var styles = {
         'bold'      : [1,  22],
         'italic'    : [3,  23],
@@ -52,6 +52,8 @@ this.puts = function (options) {
     };
 };
 
+this.log = this.puts({});
+
 this.result = function (event) {
     var result = [], buffer = [], time = '', header;
     var complete = event.honored + event.pending + event.errored + event.broken;
@@ -93,7 +95,7 @@ this.inspect = function inspect(val) {
     if (module.exports.nocolor) {
       return eyes(val);
     }
-    
+
     return '\033[1m' + eyes(val) + '\033[22m';
 };
 

diff --git a/lib/vows/reporters/spec.js b/lib/vows/reporters/spec.js
@@ -26,7 +26,7 @@ this.report = function (data) {
             puts(console.vowText(event));
             break;
         case 'end':
-            console.log();
+            this.print('\n');
             break;
         case 'finish':
             puts(console.result(event).join('\n'));

diff --git a/test/experimental/gh-325.js b/test/experimental/gh-325.js
@@ -0,0 +1,20 @@
+var vows = require('./'),
+    assert = require('assert');
+
+vows.describe('basic-formulation').addBatch({
+    "An invocation with no query string": {
+        topic: function() {
+            request.get("http://localhost:8080/something", this.callback);
+        },
+
+        "does not fail": function(error, response, body) {
+            assert.notEqual(true, error);
+        },
+
+        "receives a response": {
+            "with status 200": function(error, response, body) {
+                assert.equal(200, response.statusCode);
+            }
+        }
+    }
+}).export(module);