Merge branch 'master' into refactor

nock · Feb 6, 2012 · 7b58d96 · 7b58d96
2 parents 141176f + d16e044
commit 7b58d96
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/recorder.js b/lib/recorder.js
@@ -61,7 +61,9 @@ function record(dont_print) {
         if (! dont_print) { console.log(SEPARATOR + out + SEPARATOR); }
       });
 
-      callback.apply(res, arguments);
+      if (callback) {
+        callback.apply(res, arguments);
+      }
 
     });
     oldWrite = req.write;

diff --git a/tests/test_recorder.js b/tests/test_recorder.js
@@ -26,4 +26,16 @@ tap.test('records', function(t) {
   req.write('ABCDEF');
   req.end();
   return req;
+});
+
+tap.test('checks if callback is specified', function(t) {
+  var options = {
+    host: 'www.google.com', method: 'GET', path: '/', port: 80
+  };
+
+  nock.restore();
+  nock.recorder.rec(true);
+
+  http.request(options, undefined).end();
+  t.end();
 });